btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

chore: revert indented line wrap due to issues with mobile (fixes hoppscotch/internal-issues#9)

Browse Source
This commit is contained in:
Andrew Bastin
2022-06-13 23:05:23 +05:30
parent 6b1ca1dce1
commit a6b5295df5
2 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/hoppscotch-app/helpers/editor/codemirror.ts
View File

@@ -38,7 +38,6 @@ import { Completer } from "./completion"
import { LinterDefinition } from "./linting/linter" import { LinterDefinition } from "./linting/linter"
import { basicSetup, baseTheme, baseHighlightStyle } from "./themes/baseTheme" import { basicSetup, baseTheme, baseHighlightStyle } from "./themes/baseTheme"
import { HoppEnvironmentPlugin } from "./extensions/HoppEnvironment" import { HoppEnvironmentPlugin } from "./extensions/HoppEnvironment"
import { IndentedLineWrapPlugin } from "./extensions/IndentedLineWrap"
// TODO: Migrate from legacy mode // TODO: Migrate from legacy mode
type ExtendedEditorConfig = { type ExtendedEditorConfig = {
@@ -238,7 +237,7 @@ export function useCodemirror(
), ),
lineWrapping.of( lineWrapping.of(
options.extendedEditorConfig.lineWrapping options.extendedEditorConfig.lineWrapping
? [IndentedLineWrapPlugin] ? [EditorView.lineWrapping]
: [] : []
), ),
keymap.of([ keymap.of([
@@ -325,7 +324,7 @@ export function useCodemirror(
(newMode) => { (newMode) => {
view.value?.dispatch({ view.value?.dispatch({
effects: lineWrapping.reconfigure( effects: lineWrapping.reconfigure(
newMode ? [EditorView.lineWrapping, IndentedLineWrapPlugin] : [] newMode ? [EditorView.lineWrapping] : []
), ),
}) })
} }

27
packages/hoppscotch-app/helpers/editor/extensions/IndentedLineWrap.ts
View File

@@ -1,27 +0,0 @@
import { EditorView } from "@codemirror/view"
const WrappedLineIndenter = EditorView.updateListener.of((update) => {
const view = update.view
const charWidth = view.defaultCharacterWidth
const lineHeight = view.defaultLineHeight
const basePadding = 10
view.viewportLines((line) => {
const domAtPos = view.domAtPos(line.from)
const lineCount = (line.bottom - line.top) / lineHeight
if (lineCount <= 1) return
const belowPadding = basePadding * charWidth
const node = domAtPos.node as HTMLElement
node.style.textIndent = `-${belowPadding - charWidth + 1}px`
node.style.paddingLeft = `${belowPadding}px`
})
})
export const IndentedLineWrapPlugin = [
EditorView.lineWrapping,
WrappedLineIndenter,
]