Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,27 @@ import * as config from '@lvce-editor/eslint-config'

export default [
...config.default,
...config.recommendedVirtualDom,
...config.recommendedRegex,
...config.recommendedActions,
{
files: [
'packages/diff-view/src/parts/{ApplyEditInput,CursorConstants,DeleteLeft,DeleteRight,GetCursorPositionFromCoordinates,GetNextPaneSizes,HandleBeforeInput,HandleClickAt,HandleClickRightSide,HandleContextMenu,HandleResize,HandleSashPointerUp,HandleScrollBarPointerDown,HandleScrollBarPointerMove,HandleWheel,HandleWorkspaceChange,Initialize,InsertLineBreak,MoveCursor,SetCursorPosition,SetDiffMode,SetFontFamily,SetLayout,ToggleDiffMode,ToggleWhitespace}/**/*.ts',
],
rules: {
'virtual-dom/prefer-state-destructuring': 'off',
},
},
{
files: ['packages/diff-view/test/**/*.ts'],
rules: {
'virtual-dom/clickable-div-needs-role': 'off',
'virtual-dom/no-object-attribute-values': 'off',
'virtual-dom/prefer-constants': 'off',
'virtual-dom/prefer-merge-class-names': 'off',
'virtual-dom/valid-child-count': 'off',
},
},
{
files: ['packages/e2e/**/*.ts'],
rules: {
Expand Down
1 change: 1 addition & 0 deletions packages/diff-view/src/parts/AriaRoles/AriaRoles.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const Presentation = 'presentation'
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import type { VirtualDomNode } from '@lvce-editor/virtual-dom-worker'
import { VirtualDomElements } from '@lvce-editor/virtual-dom-worker'
import type { VisibleLine } from '../VisibleLine/VisibleLine.ts'
import * as ClassNames from '../ClassNames/ClassNames.ts'
import { mergeClassNames } from '../MergeClassNames/MergeClassNames.ts'
import { getGutterDom } from './GetGutterDom/GetGutterDom.ts'
import { getRowsDom } from './GetRowsDom/GetRowsDom.ts'

Expand All @@ -15,7 +16,7 @@ export const getContentDomWithLineNumbers = (
return [
{
childCount: 2,
className: `${ClassNames.DiffEditorContent} ${contentClassName}`,
className: mergeClassNames(ClassNames.DiffEditorContent, contentClassName),
type: VirtualDomElements.Div,
},
...getGutterDom(visibleLines, itemHeight),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import type { VirtualDomNode } from '@lvce-editor/virtual-dom-worker'
import { VirtualDomElements } from '@lvce-editor/virtual-dom-worker'
import * as ClassNames from '../ClassNames/ClassNames.ts'
import { mergeClassNames } from '../MergeClassNames/MergeClassNames.ts'

export const getContentDomWithoutLineNumbers = (contentClassName: string, rowsChildCount: number, rows: readonly VirtualDomNode[]): readonly VirtualDomNode[] => {
return [
{
childCount: rowsChildCount,
className: `${ClassNames.DiffEditorContent} ${contentClassName}`,
className: mergeClassNames(ClassNames.DiffEditorContent, contentClassName),
type: VirtualDomElements.Div,
},
...rows,
Expand Down
3 changes: 2 additions & 1 deletion packages/diff-view/src/parts/GetCursorDom/GetCursorDom.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { VirtualDomElements, type VirtualDomNode } from '@lvce-editor/virtual-dom-worker'
import * as ClassNames from '../ClassNames/ClassNames.ts'
import { mergeClassNames } from '../MergeClassNames/MergeClassNames.ts'

export const getCursorDom = (): readonly VirtualDomNode[] => {
return [
Expand All @@ -10,7 +11,7 @@ export const getCursorDom = (): readonly VirtualDomNode[] => {
},
{
childCount: 0,
className: `${ClassNames.EditorCursor} ${ClassNames.EditorCursorRight}`,
className: mergeClassNames(ClassNames.EditorCursor, ClassNames.EditorCursorRight),
type: VirtualDomElements.Div,
},
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { getImageRightDom } from '../GetImageRightDom/GetImageRightDom.ts'
import { getInlineDiffEditorVirtualDom } from '../GetInlineDiffEditorVirtualDom/GetInlineDiffEditorVirtualDom.ts'
import { getSashDom } from '../GetSashDom/GetSashDom.ts'
import { getScrollBarDom } from '../GetScrollBarDom/GetScrollBarDom.ts'
import { mergeClassNames } from '../MergeClassNames/MergeClassNames.ts'

const getRootDom = (childCount: number, className: string): VirtualDomNode => {
return {
Expand All @@ -26,7 +27,7 @@ const getRootDom = (childCount: number, className: string): VirtualDomNode => {
const getEditorBodyDom = (diffEditorLayoutClass: string): VirtualDomNode => {
return {
childCount: 3,
className: `${ClassNames.DiffEditorBody} ${diffEditorLayoutClass}`,
className: mergeClassNames(ClassNames.DiffEditorBody, diffEditorLayoutClass),
type: VirtualDomElements.Div,
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import type { VirtualDomNode } from '@lvce-editor/virtual-dom-worker'
import { VirtualDomElements } from '@lvce-editor/virtual-dom-worker'
import * as ClassNames from '../ClassNames/ClassNames.ts'
import { mergeClassNames } from '../MergeClassNames/MergeClassNames.ts'

export const getEmptyLineNumberDom = (emptyLineCount: number, itemHeight: number): VirtualDomNode => {
const height = emptyLineCount * itemHeight

return {
childCount: 0,
className: `${ClassNames.DiffEditorLineNumberEmpty} Height-${height}`,
className: mergeClassNames(ClassNames.DiffEditorLineNumberEmpty, `Height-${height}`),
type: VirtualDomElements.Div,
}
}
3 changes: 2 additions & 1 deletion packages/diff-view/src/parts/GetErrorDom/GetErrorDom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { defaultAllowedLinkSchemes } from '../AllowedLinkSchemes/AllowedLinkSche
import * as ClassNames from '../ClassNames/ClassNames.ts'
import { getErrorCodeFrameDom } from '../GetErrorCodeFrameDom/GetErrorCodeFrameDom.ts'
import { getErrorStackDom } from '../GetErrorStackDom/GetErrorStackDom.ts'
import { mergeClassNames } from '../MergeClassNames/MergeClassNames.ts'

export const getErrorDom = (
contentClassName: string,
Expand All @@ -16,7 +17,7 @@ export const getErrorDom = (
return [
{
childCount,
className: `${ClassNames.DiffEditorContent} ${contentClassName} ${ClassNames.DiffEditorError}`,
className: mergeClassNames(ClassNames.DiffEditorContent, contentClassName, ClassNames.DiffEditorError),
type: VirtualDomElements.Div,
},
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import type { VirtualDomNode } from '@lvce-editor/virtual-dom-worker'
import { VirtualDomElements } from '@lvce-editor/virtual-dom-worker'
import * as AriaRoles from '../AriaRoles/AriaRoles.ts'
import * as ClassNames from '../ClassNames/ClassNames.ts'
import * as DomEventListenerFunctions from '../DomEventListenerFunctions/DomEventListenerFunctions.ts'
import { mergeClassNames } from '../MergeClassNames/MergeClassNames.ts'

export const getImageLeftDom = (uriLeft: string, imageSrc: string): readonly VirtualDomNode[] => {
return [
{
childCount: 1,
className: `${ClassNames.DiffEditorContent} ${ClassNames.DiffEditorContentLeft}`,
className: mergeClassNames(ClassNames.DiffEditorContent, ClassNames.DiffEditorContentLeft),
onClick: DomEventListenerFunctions.HandleClickLeftSide,
role: AriaRoles.Presentation,
type: VirtualDomElements.Div,
},
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import type { VirtualDomNode } from '@lvce-editor/virtual-dom-worker'
import { VirtualDomElements } from '@lvce-editor/virtual-dom-worker'
import * as AriaRoles from '../AriaRoles/AriaRoles.ts'
import * as ClassNames from '../ClassNames/ClassNames.ts'
import * as DomEventListenerFunctions from '../DomEventListenerFunctions/DomEventListenerFunctions.ts'
import { mergeClassNames } from '../MergeClassNames/MergeClassNames.ts'

export const getImageRightDom = (uriRight: string, imageSrc: string): readonly VirtualDomNode[] => {
return [
{
childCount: 1,
className: `${ClassNames.DiffEditorContent} ${ClassNames.DiffEditorContentRight}`,
className: mergeClassNames(ClassNames.DiffEditorContent, ClassNames.DiffEditorContentRight),
onClick: DomEventListenerFunctions.HandleClickRightSide,
role: AriaRoles.Presentation,
type: VirtualDomElements.Div,
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const getInlineDiffEditorVirtualDom = (
...searchHeaderDom,
{
childCount: contentChildCount,
className: `${ClassNames.DiffEditorContent} ${ClassNames.InlineDiffEditorContent}`,
className: mergeClassNames(ClassNames.DiffEditorContent, ClassNames.InlineDiffEditorContent),
type: VirtualDomElements.Div,
},
...lineNumberDom,
Expand Down
3 changes: 2 additions & 1 deletion packages/diff-view/src/parts/GetSashDom/GetSashDom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import type { VirtualDomNode } from '@lvce-editor/virtual-dom-worker'
import { VirtualDomElements } from '@lvce-editor/virtual-dom-worker'
import * as ClassNames from '../ClassNames/ClassNames.ts'
import * as DomEventListenerFunctions from '../DomEventListenerFunctions/DomEventListenerFunctions.ts'
import { mergeClassNames } from '../MergeClassNames/MergeClassNames.ts'

export const getSashDom = (sashLayoutClass: string): VirtualDomNode => ({
childCount: 0,
className: `${ClassNames.Sash} ${sashLayoutClass}`,
className: mergeClassNames(ClassNames.Sash, sashLayoutClass),
name: 'sash',
onPointerDown: DomEventListenerFunctions.HandleSashPointerDown,
type: VirtualDomElements.Div,
Expand Down
1 change: 1 addition & 0 deletions packages/diff-view/test/GetDiffEditorVirtualDom.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ test('getDiffEditorVirtualDom renders image panes when render mode is image', ()
childCount: 1,
className: `${ClassNames.DiffEditorContent} ${ClassNames.DiffEditorContentLeft}`,
onClick: DomEventListenerFunctions.HandleClickLeftSide,
role: 'presentation',
type: VirtualDomElements.Div,
},
{
Expand Down
1 change: 1 addition & 0 deletions packages/diff-view/test/GetImageRightDom.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ test('getImageRightDom renders an image element', (): void => {
childCount: 1,
className: `${ClassNames.DiffEditorContent} ${ClassNames.DiffEditorContentRight}`,
onClick: DomEventListenerFunctions.HandleClickRightSide,
role: 'presentation',
type: VirtualDomElements.Div,
},
{
Expand Down
Loading