@dxos/react-ui-grid 0.6.12-main.15a606f → 0.6.12-main.2d19bf1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,8 +3,10 @@ import "@dxos/lit-grid/dx-grid.pcss";
3
3
  import { createComponent } from "@lit/react";
4
4
  import { createContextScope } from "@radix-ui/react-context";
5
5
  import { useControllableState } from "@radix-ui/react-use-controllable-state";
6
- import React, { forwardRef, useCallback, useState } from "react";
6
+ import React, { forwardRef, useCallback, useLayoutEffect, useState } from "react";
7
7
  import { DxGrid as NaturalDxGrid } from "@dxos/lit-grid";
8
+ import { useForwardedRef } from "@dxos/react-ui";
9
+ import { colToA1Notation, rowToA1Notation, closestCell } from "@dxos/lit-grid";
8
10
  var DxGrid = createComponent({
9
11
  tagName: "dx-grid",
10
12
  elementClass: NaturalDxGrid,
@@ -44,6 +46,15 @@ GridRoot.displayName = GRID_NAME;
44
46
  var GRID_CONTENT_NAME = "GridContent";
45
47
  var GridContent = /* @__PURE__ */ forwardRef((props, forwardedRef) => {
46
48
  const { id, editing, setEditBox, setEditing } = useGridContext(GRID_CONTENT_NAME, props.__gridScope);
49
+ const dxGrid = useForwardedRef(forwardedRef);
50
+ useLayoutEffect(() => {
51
+ if (dxGrid.current && props.getCells) {
52
+ dxGrid.current.getCells = props.getCells;
53
+ dxGrid.current.requestUpdate("initialCells");
54
+ }
55
+ }, [
56
+ props.getCells
57
+ ]);
47
58
  const handleEdit = useCallback((event) => {
48
59
  setEditBox(event.cellBox);
49
60
  setEditing({
@@ -56,7 +67,7 @@ var GridContent = /* @__PURE__ */ forwardRef((props, forwardedRef) => {
56
67
  gridId: id,
57
68
  mode: editing ? "edit" : "browse",
58
69
  onEdit: handleEdit,
59
- ref: forwardedRef
70
+ ref: dxGrid
60
71
  });
61
72
  });
62
73
  GridContent.displayName = GRID_CONTENT_NAME;
@@ -64,11 +75,188 @@ var Grid = {
64
75
  Root: GridRoot,
65
76
  Content: GridContent
66
77
  };
78
+
79
+ // packages/ui/react-ui-grid/src/CellEditor/CellEditor.tsx
80
+ import { EditorView, keymap } from "@codemirror/view";
81
+ import React2 from "react";
82
+ import { useThemeContext } from "@dxos/react-ui";
83
+ import { createBasicExtensions, createThemeExtensions, preventNewline, useTextEditor } from "@dxos/react-ui-editor";
84
+ var editorKeys = ({ onNav, onClose }) => {
85
+ return keymap.of([
86
+ {
87
+ key: "ArrowUp",
88
+ run: (editor) => {
89
+ const value = editor.state.doc.toString();
90
+ onNav?.(value, {
91
+ key: "ArrowUp"
92
+ });
93
+ return !!onNav;
94
+ }
95
+ },
96
+ {
97
+ key: "ArrowDown",
98
+ run: (editor) => {
99
+ const value = editor.state.doc.toString();
100
+ onNav?.(value, {
101
+ key: "ArrowDown"
102
+ });
103
+ return !!onNav;
104
+ }
105
+ },
106
+ {
107
+ key: "ArrowLeft",
108
+ run: (editor) => {
109
+ const value = editor.state.doc.toString();
110
+ onNav?.(value, {
111
+ key: "ArrowLeft"
112
+ });
113
+ return !!onNav;
114
+ }
115
+ },
116
+ {
117
+ key: "ArrowRight",
118
+ run: (editor) => {
119
+ const value = editor.state.doc.toString();
120
+ onNav?.(value, {
121
+ key: "ArrowRight"
122
+ });
123
+ return !!onNav;
124
+ }
125
+ },
126
+ {
127
+ key: "Enter",
128
+ run: (editor) => {
129
+ onClose(editor.state.doc.toString(), {
130
+ key: "Enter"
131
+ });
132
+ return true;
133
+ },
134
+ shift: (editor) => {
135
+ onClose(editor.state.doc.toString(), {
136
+ key: "Enter",
137
+ shift: true
138
+ });
139
+ return true;
140
+ }
141
+ },
142
+ {
143
+ key: "Tab",
144
+ run: (editor) => {
145
+ onClose(editor.state.doc.toString(), {
146
+ key: "Tab"
147
+ });
148
+ return true;
149
+ },
150
+ shift: (editor) => {
151
+ onClose(editor.state.doc.toString(), {
152
+ key: "Tab",
153
+ shift: true
154
+ });
155
+ return true;
156
+ }
157
+ },
158
+ {
159
+ key: "Escape",
160
+ run: () => {
161
+ onClose(void 0, {
162
+ key: "Escape"
163
+ });
164
+ return true;
165
+ }
166
+ }
167
+ ]);
168
+ };
169
+ var editorVariants = {
170
+ // TODO(thure): remove when legacy is no longer used.
171
+ legacy: {
172
+ root: "flex w-full",
173
+ editor: "flex w-full [&>.cm-scroller]:scrollbar-none",
174
+ content: "!px-2 !py-1"
175
+ },
176
+ grid: {
177
+ root: "absolute z-[1]",
178
+ editor: "[&>.cm-scroller]:scrollbar-none tabular-nums",
179
+ content: "!border !border-transparent !p-0.5"
180
+ }
181
+ };
182
+ var CellEditor = ({ value, extension, autoFocus, onBlur, variant = "legacy", box, gridId }) => {
183
+ const { themeMode } = useThemeContext();
184
+ const { parentRef } = useTextEditor(() => {
185
+ return {
186
+ autoFocus,
187
+ initialValue: value,
188
+ selection: {
189
+ anchor: value?.length ?? 0
190
+ },
191
+ extensions: [
192
+ extension ?? [],
193
+ preventNewline,
194
+ EditorView.focusChangeEffect.of((_, focusing) => {
195
+ if (!focusing) {
196
+ onBlur?.({
197
+ type: "blur"
198
+ });
199
+ }
200
+ return null;
201
+ }),
202
+ createBasicExtensions({
203
+ lineWrapping: false
204
+ }),
205
+ createThemeExtensions({
206
+ themeMode,
207
+ slots: {
208
+ editor: {
209
+ className: editorVariants[variant].editor
210
+ },
211
+ content: {
212
+ className: editorVariants[variant].content
213
+ }
214
+ }
215
+ })
216
+ ]
217
+ };
218
+ }, [
219
+ extension,
220
+ autoFocus,
221
+ value,
222
+ variant,
223
+ onBlur
224
+ ]);
225
+ return /* @__PURE__ */ React2.createElement("div", {
226
+ ref: parentRef,
227
+ className: editorVariants[variant].root,
228
+ style: box,
229
+ ...gridId && {
230
+ "data-grid": gridId
231
+ }
232
+ });
233
+ };
234
+
235
+ // packages/ui/react-ui-grid/src/CellEditor/GridCellEditor.tsx
236
+ import React3 from "react";
237
+ var GridCellEditor = ({ extension, getCellContent, __gridScope }) => {
238
+ const { id, editing, setEditing, editBox } = useGridContext("GridSheetCellEditor", __gridScope);
239
+ return editing ? /* @__PURE__ */ React3.createElement(CellEditor, {
240
+ variant: "grid",
241
+ value: editing.initialContent ?? getCellContent(editing.index),
242
+ autoFocus: true,
243
+ box: editBox,
244
+ onBlur: () => setEditing(null),
245
+ extension,
246
+ gridId: id
247
+ }) : null;
248
+ };
67
249
  export {
250
+ CellEditor,
68
251
  Grid,
252
+ GridCellEditor,
69
253
  GridContent,
70
254
  GridRoot,
255
+ closestCell,
256
+ colToA1Notation,
71
257
  createGridScope,
258
+ editorKeys,
259
+ rowToA1Notation,
72
260
  useGridContext
73
261
  };
74
262
  //# sourceMappingURL=index.mjs.map
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
- "sources": ["../../../src/Grid.tsx"],
4
- "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport '@dxos/lit-grid/dx-grid.pcss';\n\nimport { createComponent, type EventName } from '@lit/react';\nimport { createContextScope, type Scope } from '@radix-ui/react-context';\nimport { useControllableState } from '@radix-ui/react-use-controllable-state';\nimport React, { type ComponentProps, forwardRef, type PropsWithChildren, useCallback, useState } from 'react';\n\nimport { type DxAxisResize, type DxEditRequest, type DxGridCellsSelect, DxGrid as NaturalDxGrid } from '@dxos/lit-grid';\n\ntype DxGridElement = NaturalDxGrid;\n\nconst DxGrid = createComponent({\n tagName: 'dx-grid',\n elementClass: NaturalDxGrid,\n react: React,\n events: {\n onAxisResize: 'dx-axis-resize' as EventName<DxAxisResize>,\n onEdit: 'dx-edit-request' as EventName<DxEditRequest>,\n onSelect: 'dx-grid-cells-select' as EventName<DxGridCellsSelect>,\n },\n});\n\ntype GridEditBox = DxEditRequest['cellBox'];\n\nconst initialBox = {\n insetInlineStart: 0,\n insetBlockStart: 0,\n inlineSize: 0,\n blockSize: 0,\n} satisfies GridEditBox;\n\ntype GridEditing = { index: DxEditRequest['cellIndex']; initialContent: DxEditRequest['initialContent'] } | null;\n\ntype GridContextValue = {\n id: string;\n editing: GridEditing;\n setEditing: (nextEditing: GridEditing) => void;\n editBox: GridEditBox;\n setEditBox: (nextEditBox: GridEditBox) => void;\n};\n\ntype GridScopedProps<P> = P & { __gridScope?: Scope };\n\nconst GRID_NAME = 'Grid';\n\nconst [createGridContext, createGridScope] = createContextScope(GRID_NAME, []);\n\nconst [GridProvider, useGridContext] = createGridContext<GridContextValue>(GRID_NAME);\n\ntype GridRootProps = PropsWithChildren<\n { id: string } & Partial<{\n editing: GridEditing;\n defaultEditing: GridEditing;\n onEditingChange: (nextEditing: GridEditing) => void;\n }>\n>;\n\nconst GridRoot = ({\n id,\n editing: propsEditing,\n defaultEditing,\n onEditingChange,\n children,\n __gridScope,\n}: GridScopedProps<GridRootProps>) => {\n const [editing = null, setEditing] = useControllableState({\n prop: propsEditing,\n defaultProp: defaultEditing,\n onChange: onEditingChange,\n });\n const [editBox, setEditBox] = useState<GridEditBox>(initialBox);\n return (\n <GridProvider\n id={id}\n editing={editing}\n setEditing={setEditing}\n editBox={editBox}\n setEditBox={setEditBox}\n scope={__gridScope}\n >\n {children}\n </GridProvider>\n );\n};\n\nGridRoot.displayName = GRID_NAME;\n\ntype GridContentProps = Omit<ComponentProps<typeof DxGrid>, 'onEdit'>;\n\nconst GRID_CONTENT_NAME = 'GridContent';\n\nconst GridContent = forwardRef<NaturalDxGrid, GridScopedProps<GridContentProps>>((props, forwardedRef) => {\n const { id, editing, setEditBox, setEditing } = useGridContext(GRID_CONTENT_NAME, props.__gridScope);\n\n const handleEdit = useCallback((event: DxEditRequest) => {\n setEditBox(event.cellBox);\n setEditing({ index: event.cellIndex, initialContent: event.initialContent });\n }, []);\n\n return <DxGrid {...props} gridId={id} mode={editing ? 'edit' : 'browse'} onEdit={handleEdit} ref={forwardedRef} />;\n});\n\nGridContent.displayName = GRID_CONTENT_NAME;\n\nexport const Grid = {\n Root: GridRoot,\n Content: GridContent,\n};\n\nexport { GridRoot, GridContent, useGridContext, createGridScope };\n\nexport type { GridRootProps, GridContentProps, GridEditing, GridEditBox, GridScopedProps, DxGridElement };\n"],
5
- "mappings": ";AAIA,OAAO;AAEP,SAASA,uBAAuC;AAChD,SAASC,0BAAsC;AAC/C,SAASC,4BAA4B;AACrC,OAAOC,SAA8BC,YAAoCC,aAAaC,gBAAgB;AAEtG,SAAwEC,UAAUC,qBAAqB;AAIvG,IAAMC,SAASC,gBAAgB;EAC7BC,SAAS;EACTC,cAAcC;EACdC,OAAOC;EACPC,QAAQ;IACNC,cAAc;IACdC,QAAQ;IACRC,UAAU;EACZ;AACF,CAAA;AAIA,IAAMC,aAAa;EACjBC,kBAAkB;EAClBC,iBAAiB;EACjBC,YAAY;EACZC,WAAW;AACb;AAcA,IAAMC,YAAY;AAElB,IAAM,CAACC,mBAAmBC,eAAAA,IAAmBC,mBAAmBH,WAAW,CAAA,CAAE;AAE7E,IAAM,CAACI,cAAcC,cAAAA,IAAkBJ,kBAAoCD,SAAAA;AAU3E,IAAMM,WAAW,CAAC,EAChBC,IACAC,SAASC,cACTC,gBACAC,iBACAC,UACAC,YAAW,MACoB;AAC/B,QAAM,CAACL,UAAU,MAAMM,UAAAA,IAAcC,qBAAqB;IACxDC,MAAMP;IACNQ,aAAaP;IACbQ,UAAUP;EACZ,CAAA;AACA,QAAM,CAACQ,SAASC,UAAAA,IAAcC,SAAsB1B,UAAAA;AACpD,SACE,sBAAA,cAACS,cAAAA;IACCG;IACAC;IACAM;IACAK;IACAC;IACAE,OAAOT;KAEND,QAAAA;AAGP;AAEAN,SAASiB,cAAcvB;AAIvB,IAAMwB,oBAAoB;AAE1B,IAAMC,cAAcC,2BAA6D,CAACC,OAAOC,iBAAAA;AACvF,QAAM,EAAErB,IAAIC,SAASY,YAAYN,WAAU,IAAKT,eAAemB,mBAAmBG,MAAMd,WAAW;AAEnG,QAAMgB,aAAaC,YAAY,CAACC,UAAAA;AAC9BX,eAAWW,MAAMC,OAAO;AACxBlB,eAAW;MAAEmB,OAAOF,MAAMG;MAAWC,gBAAgBJ,MAAMI;IAAe,CAAA;EAC5E,GAAG,CAAA,CAAE;AAEL,SAAO,sBAAA,cAACnD,QAAAA;IAAQ,GAAG2C;IAAOS,QAAQ7B;IAAI8B,MAAM7B,UAAU,SAAS;IAAUf,QAAQoC;IAAYS,KAAKV;;AACpG,CAAA;AAEAH,YAAYF,cAAcC;AAEnB,IAAMe,OAAO;EAClBC,MAAMlC;EACNmC,SAAShB;AACX;",
6
- "names": ["createComponent", "createContextScope", "useControllableState", "React", "forwardRef", "useCallback", "useState", "DxGrid", "NaturalDxGrid", "DxGrid", "createComponent", "tagName", "elementClass", "NaturalDxGrid", "react", "React", "events", "onAxisResize", "onEdit", "onSelect", "initialBox", "insetInlineStart", "insetBlockStart", "inlineSize", "blockSize", "GRID_NAME", "createGridContext", "createGridScope", "createContextScope", "GridProvider", "useGridContext", "GridRoot", "id", "editing", "propsEditing", "defaultEditing", "onEditingChange", "children", "__gridScope", "setEditing", "useControllableState", "prop", "defaultProp", "onChange", "editBox", "setEditBox", "useState", "scope", "displayName", "GRID_CONTENT_NAME", "GridContent", "forwardRef", "props", "forwardedRef", "handleEdit", "useCallback", "event", "cellBox", "index", "cellIndex", "initialContent", "gridId", "mode", "ref", "Grid", "Root", "Content"]
3
+ "sources": ["../../../src/Grid.tsx", "../../../src/CellEditor/CellEditor.tsx", "../../../src/CellEditor/GridCellEditor.tsx"],
4
+ "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport '@dxos/lit-grid/dx-grid.pcss';\n\nimport { createComponent, type EventName } from '@lit/react';\nimport { createContextScope, type Scope } from '@radix-ui/react-context';\nimport { useControllableState } from '@radix-ui/react-use-controllable-state';\nimport React, {\n type ComponentProps,\n forwardRef,\n type PropsWithChildren,\n useCallback,\n useLayoutEffect,\n useState,\n} from 'react';\n\nimport { type DxAxisResize, type DxEditRequest, type DxGridCellsSelect, DxGrid as NaturalDxGrid } from '@dxos/lit-grid';\nimport { useForwardedRef } from '@dxos/react-ui';\n\ntype DxGridElement = NaturalDxGrid;\n\nconst DxGrid = createComponent({\n tagName: 'dx-grid',\n elementClass: NaturalDxGrid,\n react: React,\n events: {\n onAxisResize: 'dx-axis-resize' as EventName<DxAxisResize>,\n onEdit: 'dx-edit-request' as EventName<DxEditRequest>,\n onSelect: 'dx-grid-cells-select' as EventName<DxGridCellsSelect>,\n },\n});\n\ntype GridEditBox = DxEditRequest['cellBox'];\n\nconst initialBox = {\n insetInlineStart: 0,\n insetBlockStart: 0,\n inlineSize: 0,\n blockSize: 0,\n} satisfies GridEditBox;\n\ntype GridEditing = { index: DxEditRequest['cellIndex']; initialContent: DxEditRequest['initialContent'] } | null;\n\ntype GridContextValue = {\n id: string;\n editing: GridEditing;\n setEditing: (nextEditing: GridEditing) => void;\n editBox: GridEditBox;\n setEditBox: (nextEditBox: GridEditBox) => void;\n};\n\ntype GridScopedProps<P> = P & { __gridScope?: Scope };\n\nconst GRID_NAME = 'Grid';\n\nconst [createGridContext, createGridScope] = createContextScope(GRID_NAME, []);\n\nconst [GridProvider, useGridContext] = createGridContext<GridContextValue>(GRID_NAME);\n\ntype GridRootProps = PropsWithChildren<\n { id: string } & Partial<{\n editing: GridEditing;\n defaultEditing: GridEditing;\n onEditingChange: (nextEditing: GridEditing) => void;\n }>\n>;\n\nconst GridRoot = ({\n id,\n editing: propsEditing,\n defaultEditing,\n onEditingChange,\n children,\n __gridScope,\n}: GridScopedProps<GridRootProps>) => {\n const [editing = null, setEditing] = useControllableState({\n prop: propsEditing,\n defaultProp: defaultEditing,\n onChange: onEditingChange,\n });\n const [editBox, setEditBox] = useState<GridEditBox>(initialBox);\n return (\n <GridProvider\n id={id}\n editing={editing}\n setEditing={setEditing}\n editBox={editBox}\n setEditBox={setEditBox}\n scope={__gridScope}\n >\n {children}\n </GridProvider>\n );\n};\n\nGridRoot.displayName = GRID_NAME;\n\ntype GridContentProps = Omit<ComponentProps<typeof DxGrid>, 'onEdit'> & {\n getCells?: NonNullable<NaturalDxGrid['getCells']>;\n};\n\nconst GRID_CONTENT_NAME = 'GridContent';\n\nconst GridContent = forwardRef<NaturalDxGrid, GridScopedProps<GridContentProps>>((props, forwardedRef) => {\n const { id, editing, setEditBox, setEditing } = useGridContext(GRID_CONTENT_NAME, props.__gridScope);\n const dxGrid = useForwardedRef(forwardedRef);\n\n // Needed instead of `useEffect` to ensure the DxGrid ref is defined.\n useLayoutEffect(() => {\n if (dxGrid.current && props.getCells) {\n dxGrid.current.getCells = props.getCells;\n dxGrid.current.requestUpdate('initialCells');\n }\n }, [props.getCells]);\n\n const handleEdit = useCallback((event: DxEditRequest) => {\n setEditBox(event.cellBox);\n setEditing({ index: event.cellIndex, initialContent: event.initialContent });\n }, []);\n\n return <DxGrid {...props} gridId={id} mode={editing ? 'edit' : 'browse'} onEdit={handleEdit} ref={dxGrid} />;\n});\n\nGridContent.displayName = GRID_CONTENT_NAME;\n\nexport const Grid = {\n Root: GridRoot,\n Content: GridContent,\n};\n\nexport { GridRoot, GridContent, useGridContext, createGridScope };\n\nexport type { GridRootProps, GridContentProps, GridEditing, GridEditBox, GridScopedProps, DxGridElement };\n\nexport { colToA1Notation, rowToA1Notation, closestCell } from '@dxos/lit-grid';\n\nexport type {\n DxGridRange,\n DxGridAxisMeta,\n DxAxisResize,\n DxGridCells,\n DxGridPlaneRange,\n DxGridPlaneCells,\n DxGridPlane,\n DxGridPosition,\n} from '@dxos/lit-grid';\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { type Extension } from '@codemirror/state';\nimport { EditorView, keymap } from '@codemirror/view';\nimport React, { type DOMAttributes, type KeyboardEvent } from 'react';\n\nimport { useThemeContext } from '@dxos/react-ui';\nimport {\n type UseTextEditorProps,\n createBasicExtensions,\n createThemeExtensions,\n preventNewline,\n useTextEditor,\n} from '@dxos/react-ui-editor';\n\nimport { type GridEditBox } from '../Grid';\n\ntype EditorKeyEvent = Pick<KeyboardEvent<HTMLInputElement>, 'key'> & { shift?: boolean };\n\nexport type EditorKeysProps = {\n onClose: (value: string | undefined, event: EditorKeyEvent) => void;\n onNav?: (value: string | undefined, event: EditorKeyEvent) => void;\n};\n\n// TODO(Zan): Should each consumer be responsible for defining these?\nexport const editorKeys = ({ onNav, onClose }: EditorKeysProps): Extension => {\n return keymap.of([\n {\n key: 'ArrowUp',\n run: (editor) => {\n const value = editor.state.doc.toString();\n onNav?.(value, { key: 'ArrowUp' });\n return !!onNav;\n },\n },\n {\n key: 'ArrowDown',\n run: (editor) => {\n const value = editor.state.doc.toString();\n onNav?.(value, { key: 'ArrowDown' });\n return !!onNav;\n },\n },\n {\n key: 'ArrowLeft',\n run: (editor) => {\n const value = editor.state.doc.toString();\n onNav?.(value, { key: 'ArrowLeft' });\n return !!onNav;\n },\n },\n {\n key: 'ArrowRight',\n run: (editor) => {\n const value = editor.state.doc.toString();\n onNav?.(value, { key: 'ArrowRight' });\n return !!onNav;\n },\n },\n {\n key: 'Enter',\n run: (editor) => {\n onClose(editor.state.doc.toString(), { key: 'Enter' });\n return true;\n },\n shift: (editor) => {\n onClose(editor.state.doc.toString(), { key: 'Enter', shift: true });\n return true;\n },\n },\n {\n key: 'Tab',\n run: (editor) => {\n onClose(editor.state.doc.toString(), { key: 'Tab' });\n return true;\n },\n shift: (editor) => {\n onClose(editor.state.doc.toString(), { key: 'Tab', shift: true });\n return true;\n },\n },\n {\n key: 'Escape',\n run: () => {\n onClose(undefined, { key: 'Escape' });\n return true;\n },\n },\n ]);\n};\n\nexport type CellEditorProps = {\n value?: string;\n extension?: Extension;\n variant?: keyof typeof editorVariants;\n box?: GridEditBox;\n gridId?: string;\n} & Pick<UseTextEditorProps, 'autoFocus'> &\n Pick<DOMAttributes<HTMLInputElement>, 'onBlur' | 'onKeyDown'>;\n\nconst editorVariants = {\n // TODO(thure): remove when legacy is no longer used.\n legacy: {\n root: 'flex w-full',\n editor: 'flex w-full [&>.cm-scroller]:scrollbar-none',\n content: '!px-2 !py-1',\n },\n grid: {\n root: 'absolute z-[1]',\n editor: '[&>.cm-scroller]:scrollbar-none tabular-nums',\n content: '!border !border-transparent !p-0.5',\n },\n};\n\nexport const CellEditor = ({\n value,\n extension,\n autoFocus,\n onBlur,\n variant = 'legacy',\n box,\n gridId,\n}: CellEditorProps) => {\n const { themeMode } = useThemeContext();\n const { parentRef } = useTextEditor(() => {\n return {\n autoFocus,\n initialValue: value,\n selection: { anchor: value?.length ?? 0 },\n extensions: [\n extension ?? [],\n preventNewline,\n EditorView.focusChangeEffect.of((_, focusing) => {\n if (!focusing) {\n onBlur?.({ type: 'blur' } as any);\n }\n return null;\n }),\n createBasicExtensions({ lineWrapping: false }),\n createThemeExtensions({\n themeMode,\n slots: {\n editor: {\n className: editorVariants[variant].editor,\n },\n content: {\n className: editorVariants[variant].content,\n },\n },\n }),\n ],\n };\n }, [extension, autoFocus, value, variant, onBlur]);\n\n return (\n <div\n ref={parentRef}\n className={editorVariants[variant].root}\n style={box}\n {...(gridId && { 'data-grid': gridId })}\n />\n );\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport React from 'react';\n\nimport { CellEditor, type CellEditorProps } from './CellEditor';\nimport { type GridScopedProps, useGridContext } from '../Grid';\n\nexport const GridCellEditor = ({\n extension,\n getCellContent,\n __gridScope,\n}: GridScopedProps<Pick<CellEditorProps, 'extension'> & { getCellContent: (index: string) => string | undefined }>) => {\n const { id, editing, setEditing, editBox } = useGridContext('GridSheetCellEditor', __gridScope);\n\n return editing ? (\n <CellEditor\n variant='grid'\n value={editing.initialContent ?? getCellContent(editing.index)}\n autoFocus\n box={editBox}\n onBlur={() => setEditing(null)}\n extension={extension}\n gridId={id}\n />\n ) : null;\n};\n"],
5
+ "mappings": "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",
6
+ "names": ["createComponent", "createContextScope", "useControllableState", "React", "forwardRef", "useCallback", "useLayoutEffect", "useState", "DxGrid", "NaturalDxGrid", "useForwardedRef", "colToA1Notation", "rowToA1Notation", "closestCell", "DxGrid", "createComponent", "tagName", "elementClass", "NaturalDxGrid", "react", "React", "events", "onAxisResize", "onEdit", "onSelect", "initialBox", "insetInlineStart", "insetBlockStart", "inlineSize", "blockSize", "GRID_NAME", "createGridContext", "createGridScope", "createContextScope", "GridProvider", "useGridContext", "GridRoot", "id", "editing", "propsEditing", "defaultEditing", "onEditingChange", "children", "__gridScope", "setEditing", "useControllableState", "prop", "defaultProp", "onChange", "editBox", "setEditBox", "useState", "scope", "displayName", "GRID_CONTENT_NAME", "GridContent", "forwardRef", "props", "forwardedRef", "dxGrid", "useForwardedRef", "useLayoutEffect", "current", "getCells", "requestUpdate", "handleEdit", "useCallback", "event", "cellBox", "index", "cellIndex", "initialContent", "gridId", "mode", "ref", "Grid", "Root", "Content", "EditorView", "keymap", "React", "useThemeContext", "createBasicExtensions", "createThemeExtensions", "preventNewline", "useTextEditor", "editorKeys", "onNav", "onClose", "keymap", "of", "key", "run", "editor", "value", "state", "doc", "toString", "shift", "undefined", "editorVariants", "legacy", "root", "content", "grid", "CellEditor", "extension", "autoFocus", "onBlur", "variant", "box", "gridId", "themeMode", "useThemeContext", "parentRef", "useTextEditor", "initialValue", "selection", "anchor", "length", "extensions", "preventNewline", "EditorView", "focusChangeEffect", "_", "focusing", "type", "createBasicExtensions", "lineWrapping", "createThemeExtensions", "slots", "className", "React", "div", "ref", "style", "React", "GridCellEditor", "extension", "getCellContent", "__gridScope", "id", "editing", "setEditing", "editBox", "useGridContext", "React", "CellEditor", "variant", "value", "initialContent", "index", "autoFocus", "box", "onBlur", "gridId"]
7
7
  }
@@ -1 +1 @@
1
- {"inputs":{"packages/ui/react-ui-grid/src/Grid.tsx":{"bytes":10228,"imports":[{"path":"@dxos/lit-grid/dx-grid.pcss","kind":"import-statement","external":true},{"path":"@lit/react","kind":"import-statement","external":true},{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"@radix-ui/react-use-controllable-state","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/lit-grid","kind":"import-statement","external":true}],"format":"esm"},"packages/ui/react-ui-grid/src/index.ts":{"bytes":489,"imports":[{"path":"packages/ui/react-ui-grid/src/Grid.tsx","kind":"import-statement","original":"./Grid"}],"format":"esm"}},"outputs":{"packages/ui/react-ui-grid/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":5768},"packages/ui/react-ui-grid/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/lit-grid/dx-grid.pcss","kind":"import-statement","external":true},{"path":"@lit/react","kind":"import-statement","external":true},{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"@radix-ui/react-use-controllable-state","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/lit-grid","kind":"import-statement","external":true}],"exports":["Grid","GridContent","GridRoot","createGridScope","useGridContext"],"entryPoint":"packages/ui/react-ui-grid/src/index.ts","inputs":{"packages/ui/react-ui-grid/src/Grid.tsx":{"bytesInOutput":2043},"packages/ui/react-ui-grid/src/index.ts":{"bytesInOutput":0}},"bytes":2203}}}
1
+ {"inputs":{"packages/ui/react-ui-grid/src/Grid.tsx":{"bytes":12329,"imports":[{"path":"@dxos/lit-grid/dx-grid.pcss","kind":"import-statement","external":true},{"path":"@lit/react","kind":"import-statement","external":true},{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"@radix-ui/react-use-controllable-state","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/lit-grid","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/lit-grid","kind":"import-statement","external":true}],"format":"esm"},"packages/ui/react-ui-grid/src/CellEditor/CellEditor.tsx":{"bytes":14862,"imports":[{"path":"@codemirror/view","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/react-ui-editor","kind":"import-statement","external":true}],"format":"esm"},"packages/ui/react-ui-grid/src/CellEditor/GridCellEditor.tsx":{"bytes":2887,"imports":[{"path":"react","kind":"import-statement","external":true},{"path":"packages/ui/react-ui-grid/src/CellEditor/CellEditor.tsx","kind":"import-statement","original":"./CellEditor"},{"path":"packages/ui/react-ui-grid/src/Grid.tsx","kind":"import-statement","original":"../Grid"}],"format":"esm"},"packages/ui/react-ui-grid/src/CellEditor/index.ts":{"bytes":620,"imports":[{"path":"packages/ui/react-ui-grid/src/CellEditor/CellEditor.tsx","kind":"import-statement","original":"./CellEditor"},{"path":"packages/ui/react-ui-grid/src/CellEditor/GridCellEditor.tsx","kind":"import-statement","original":"./GridCellEditor"}],"format":"esm"},"packages/ui/react-ui-grid/src/index.ts":{"bytes":583,"imports":[{"path":"packages/ui/react-ui-grid/src/Grid.tsx","kind":"import-statement","original":"./Grid"},{"path":"packages/ui/react-ui-grid/src/CellEditor/index.ts","kind":"import-statement","original":"./CellEditor"}],"format":"esm"}},"outputs":{"packages/ui/react-ui-grid/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":15661},"packages/ui/react-ui-grid/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/lit-grid/dx-grid.pcss","kind":"import-statement","external":true},{"path":"@lit/react","kind":"import-statement","external":true},{"path":"@radix-ui/react-context","kind":"import-statement","external":true},{"path":"@radix-ui/react-use-controllable-state","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/lit-grid","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/lit-grid","kind":"import-statement","external":true},{"path":"@codemirror/view","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true},{"path":"@dxos/react-ui","kind":"import-statement","external":true},{"path":"@dxos/react-ui-editor","kind":"import-statement","external":true},{"path":"react","kind":"import-statement","external":true}],"exports":["CellEditor","Grid","GridCellEditor","GridContent","GridRoot","closestCell","colToA1Notation","createGridScope","editorKeys","rowToA1Notation","useGridContext"],"entryPoint":"packages/ui/react-ui-grid/src/index.ts","inputs":{"packages/ui/react-ui-grid/src/Grid.tsx":{"bytesInOutput":2440},"packages/ui/react-ui-grid/src/index.ts":{"bytesInOutput":0},"packages/ui/react-ui-grid/src/CellEditor/CellEditor.tsx":{"bytesInOutput":3537},"packages/ui/react-ui-grid/src/CellEditor/index.ts":{"bytesInOutput":0},"packages/ui/react-ui-grid/src/CellEditor/GridCellEditor.tsx":{"bytesInOutput":478}},"bytes":6838}}}
@@ -0,0 +1,34 @@
1
+ import { type Extension } from '@codemirror/state';
2
+ import React, { type DOMAttributes, type KeyboardEvent } from 'react';
3
+ import { type UseTextEditorProps } from '@dxos/react-ui-editor';
4
+ import { type GridEditBox } from '../Grid';
5
+ type EditorKeyEvent = Pick<KeyboardEvent<HTMLInputElement>, 'key'> & {
6
+ shift?: boolean;
7
+ };
8
+ export type EditorKeysProps = {
9
+ onClose: (value: string | undefined, event: EditorKeyEvent) => void;
10
+ onNav?: (value: string | undefined, event: EditorKeyEvent) => void;
11
+ };
12
+ export declare const editorKeys: ({ onNav, onClose }: EditorKeysProps) => Extension;
13
+ export type CellEditorProps = {
14
+ value?: string;
15
+ extension?: Extension;
16
+ variant?: keyof typeof editorVariants;
17
+ box?: GridEditBox;
18
+ gridId?: string;
19
+ } & Pick<UseTextEditorProps, 'autoFocus'> & Pick<DOMAttributes<HTMLInputElement>, 'onBlur' | 'onKeyDown'>;
20
+ declare const editorVariants: {
21
+ legacy: {
22
+ root: string;
23
+ editor: string;
24
+ content: string;
25
+ };
26
+ grid: {
27
+ root: string;
28
+ editor: string;
29
+ content: string;
30
+ };
31
+ };
32
+ export declare const CellEditor: ({ value, extension, autoFocus, onBlur, variant, box, gridId, }: CellEditorProps) => React.JSX.Element;
33
+ export {};
34
+ //# sourceMappingURL=CellEditor.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"CellEditor.d.ts","sourceRoot":"","sources":["../../../../src/CellEditor/CellEditor.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEnD,OAAO,KAAK,EAAE,EAAE,KAAK,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,OAAO,CAAC;AAGtE,OAAO,EACL,KAAK,kBAAkB,EAKxB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,SAAS,CAAC;AAE3C,KAAK,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAEzF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IACpE,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;CACpE,CAAC;AAGF,eAAO,MAAM,UAAU,uBAAwB,eAAe,KAAG,SAgEhE,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,OAAO,cAAc,CAAC;IACtC,GAAG,CAAC,EAAE,WAAW,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,IAAI,CAAC,kBAAkB,EAAE,WAAW,CAAC,GACvC,IAAI,CAAC,aAAa,CAAC,gBAAgB,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC;AAEhE,QAAA,MAAM,cAAc;;;;;;;;;;;CAYnB,CAAC;AAEF,eAAO,MAAM,UAAU,mEAQpB,eAAe,sBAwCjB,CAAC"}
@@ -0,0 +1,7 @@
1
+ import React from 'react';
2
+ import { type CellEditorProps } from './CellEditor';
3
+ import { type GridScopedProps } from '../Grid';
4
+ export declare const GridCellEditor: ({ extension, getCellContent, __gridScope, }: GridScopedProps<Pick<CellEditorProps, "extension"> & {
5
+ getCellContent: (index: string) => string | undefined;
6
+ }>) => React.JSX.Element | null;
7
+ //# sourceMappingURL=GridCellEditor.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"GridCellEditor.d.ts","sourceRoot":"","sources":["../../../../src/CellEditor/GridCellEditor.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAc,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,KAAK,eAAe,EAAkB,MAAM,SAAS,CAAC;AAE/D,eAAO,MAAM,cAAc,gDAIxB,eAAe,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,GAAG;IAAE,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAA;CAAE,CAAC,6BAcjH,CAAC"}
@@ -0,0 +1,3 @@
1
+ export * from './CellEditor';
2
+ export * from './GridCellEditor';
3
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/CellEditor/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC"}
@@ -37,7 +37,9 @@ declare const GridRoot: {
37
37
  ({ id, editing: propsEditing, defaultEditing, onEditingChange, children, __gridScope, }: GridScopedProps<GridRootProps>): React.JSX.Element;
38
38
  displayName: string;
39
39
  };
40
- type GridContentProps = Omit<ComponentProps<typeof DxGrid>, 'onEdit'>;
40
+ type GridContentProps = Omit<ComponentProps<typeof DxGrid>, 'onEdit'> & {
41
+ getCells?: NonNullable<NaturalDxGrid['getCells']>;
42
+ };
41
43
  declare const GridContent: React.ForwardRefExoticComponent<Omit<GridScopedProps<GridContentProps>, "ref"> & React.RefAttributes<NaturalDxGrid>>;
42
44
  export declare const Grid: {
43
45
  Root: {
@@ -48,4 +50,6 @@ export declare const Grid: {
48
50
  };
49
51
  export { GridRoot, GridContent, useGridContext, createGridScope };
50
52
  export type { GridRootProps, GridContentProps, GridEditing, GridEditBox, GridScopedProps, DxGridElement };
53
+ export { colToA1Notation, rowToA1Notation, closestCell } from '@dxos/lit-grid';
54
+ export type { DxGridRange, DxGridAxisMeta, DxAxisResize, DxGridCells, DxGridPlaneRange, DxGridPlaneCells, DxGridPlane, DxGridPosition, } from '@dxos/lit-grid';
51
55
  //# sourceMappingURL=Grid.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"Grid.d.ts","sourceRoot":"","sources":["../../../src/Grid.tsx"],"names":[],"mappings":"AAIA,OAAO,6BAA6B,CAAC;AAErC,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAsB,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,KAAK,EAAE,EAAE,KAAK,cAAc,EAAc,KAAK,iBAAiB,EAAyB,MAAM,OAAO,CAAC;AAE9G,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAExH,KAAK,aAAa,GAAG,aAAa,CAAC;AAEnC,QAAA,MAAM,MAAM;kBAK0B,SAAS,CAAC,YAAY,CAAC;YAC5B,SAAS,CAAC,aAAa,CAAC;cACjB,SAAS,CAAC,iBAAiB,CAAC;EAElE,CAAC;AAEH,KAAK,WAAW,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;AAS5C,KAAK,WAAW,GAAG;IAAE,KAAK,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;IAAC,cAAc,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAA;CAAE,GAAG,IAAI,CAAC;AAEjH,KAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;IAC/C,OAAO,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;CAChD,CAAC;AAEF,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,WAAW,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAItD,QAAA,MAA0B,eAAe,+CAAqC,CAAC;AAE/E,QAAA,MAAqB,cAAc,wFAAkD,CAAC;AAEtF,KAAK,aAAa,GAAG,iBAAiB,CACpC;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;IAC5B,eAAe,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;CACrD,CAAC,CACH,CAAC;AAEF,QAAA,MAAM,QAAQ;6FAOX,eAAe,CAAC,aAAa,CAAC;;CAmBhC,CAAC;AAIF,KAAK,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,MAAM,CAAC,EAAE,QAAQ,CAAC,CAAC;AAItE,QAAA,MAAM,WAAW,sHASf,CAAC;AAIH,eAAO,MAAM,IAAI;;iGAxCd,eAAe,CAAC,aAAa,CAAC;;;;CA2ChC,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAElE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC"}
1
+ {"version":3,"file":"Grid.d.ts","sourceRoot":"","sources":["../../../src/Grid.tsx"],"names":[],"mappings":"AAIA,OAAO,6BAA6B,CAAC;AAErC,OAAO,EAAmB,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAsB,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAEzE,OAAO,KAAK,EAAE,EACZ,KAAK,cAAc,EAEnB,KAAK,iBAAiB,EAIvB,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,KAAK,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,iBAAiB,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAGxH,KAAK,aAAa,GAAG,aAAa,CAAC;AAEnC,QAAA,MAAM,MAAM;kBAK0B,SAAS,CAAC,YAAY,CAAC;YAC5B,SAAS,CAAC,aAAa,CAAC;cACjB,SAAS,CAAC,iBAAiB,CAAC;EAElE,CAAC;AAEH,KAAK,WAAW,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;AAS5C,KAAK,WAAW,GAAG;IAAE,KAAK,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;IAAC,cAAc,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAA;CAAE,GAAG,IAAI,CAAC;AAEjH,KAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;IAC/C,OAAO,EAAE,WAAW,CAAC;IACrB,UAAU,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;CAChD,CAAC;AAEF,KAAK,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG;IAAE,WAAW,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAItD,QAAA,MAA0B,eAAe,+CAAqC,CAAC;AAE/E,QAAA,MAAqB,cAAc,wFAAkD,CAAC;AAEtF,KAAK,aAAa,GAAG,iBAAiB,CACpC;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,cAAc,EAAE,WAAW,CAAC;IAC5B,eAAe,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;CACrD,CAAC,CACH,CAAC;AAEF,QAAA,MAAM,QAAQ;6FAOX,eAAe,CAAC,aAAa,CAAC;;CAmBhC,CAAC;AAIF,KAAK,gBAAgB,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG;IACtE,QAAQ,CAAC,EAAE,WAAW,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;CACnD,CAAC;AAIF,QAAA,MAAM,WAAW,sHAkBf,CAAC;AAIH,eAAO,MAAM,IAAI;;iGAnDd,eAAe,CAAC,aAAa,CAAC;;;;CAsDhC,CAAC;AAEF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,eAAe,EAAE,CAAC;AAElE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC;AAE1G,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE/E,YAAY,EACV,WAAW,EACX,cAAc,EACd,YAAY,EACZ,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,cAAc,GACf,MAAM,gBAAgB,CAAC"}
@@ -14,37 +14,45 @@ export default _default;
14
14
  export declare const Basic: {
15
15
  args: {
16
16
  id: string;
17
- cells: {
18
- '1,1': {
19
- value: string;
17
+ initialCells: {
18
+ grid: {
19
+ '1,1': {
20
+ value: string;
21
+ };
20
22
  };
21
23
  };
22
24
  columnDefault: {
23
- size: number;
24
- resizeable: true;
25
- };
26
- rowDefault: {
27
- size: number;
28
- resizeable: true;
29
- };
30
- columns: {
31
- 0: {
25
+ grid: {
32
26
  size: number;
27
+ resizeable: true;
33
28
  };
34
- 1: {
35
- size: number;
36
- };
37
- 2: {
38
- size: number;
39
- };
40
- 3: {
29
+ };
30
+ rowDefault: {
31
+ grid: {
41
32
  size: number;
33
+ resizeable: true;
42
34
  };
43
- 4: {
44
- size: number;
35
+ };
36
+ columns: {
37
+ grid: {
38
+ 0: {
39
+ size: number;
40
+ };
41
+ 1: {
42
+ size: number;
43
+ };
44
+ 2: {
45
+ size: number;
46
+ };
47
+ 3: {
48
+ size: number;
49
+ };
50
+ 4: {
51
+ size: number;
52
+ };
45
53
  };
46
54
  };
47
- onAxisResize: (event: import("packages/ui/lit-grid/dist/types/src").DxAxisResize) => void;
55
+ onAxisResize: (event: import("packages/ui/lit-grid/dist/src/types").DxAxisResize) => void;
48
56
  onEditingChange: (event: import("./Grid").GridEditing) => void;
49
57
  };
50
58
  };
@@ -1 +1 @@
1
- {"version":3,"file":"Grid.stories.d.ts","sourceRoot":"","sources":["../../../src/Grid.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAQ,KAAK,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEzE,KAAK,cAAc,GAAG,gBAAgB,GAAG,IAAI,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;;;+CAE9B,cAAc;;;;;;AAQhE,wBAKE;AAEF,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BjB,CAAC"}
1
+ {"version":3,"file":"Grid.stories.d.ts","sourceRoot":"","sources":["../../../src/Grid.stories.tsx"],"names":[],"mappings":"AAIA,OAAO,aAAa,CAAC;AAErB,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAQ,KAAK,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEzE,KAAK,cAAc,GAAG,gBAAgB,GAAG,IAAI,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;;;+CAE9B,cAAc;;;;;;AAQhE,wBAKE;AAEF,eAAO,MAAM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuCjB,CAAC"}
@@ -1,2 +1,3 @@
1
1
  export * from './Grid';
2
+ export * from './CellEditor';
2
3
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,QAAQ,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/react-ui-grid",
3
- "version": "0.6.12-main.15a606f",
3
+ "version": "0.6.12-main.2d19bf1",
4
4
  "description": "React component which manages a `dx-grid` Lit web component.",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -21,13 +21,16 @@
21
21
  "src"
22
22
  ],
23
23
  "dependencies": {
24
+ "@codemirror/state": "^6.4.1",
25
+ "@codemirror/view": "^6.34.1",
24
26
  "@lit/react": "^1.0.5",
25
27
  "@radix-ui/react-context": "^1.0.0",
26
28
  "@radix-ui/react-use-controllable-state": "^1.0.0",
27
- "@dxos/lit-grid": "0.6.12-main.15a606f",
28
- "@dxos/react-ui": "0.6.12-main.15a606f",
29
- "@dxos/react-ui-theme": "0.6.12-main.15a606f",
30
- "@dxos/util": "0.6.12-main.15a606f"
29
+ "@dxos/lit-grid": "0.6.12-main.2d19bf1",
30
+ "@dxos/react-ui-editor": "0.6.12-main.2d19bf1",
31
+ "@dxos/react-ui": "0.6.12-main.2d19bf1",
32
+ "@dxos/react-ui-theme": "0.6.12-main.2d19bf1",
33
+ "@dxos/util": "0.6.12-main.2d19bf1"
31
34
  },
32
35
  "devDependencies": {
33
36
  "@types/react": "~18.2.0",
@@ -35,7 +38,7 @@
35
38
  "react": "~18.2.0",
36
39
  "react-dom": "~18.2.0",
37
40
  "vite": "5.4.7",
38
- "@dxos/storybook-utils": "0.6.12-main.15a606f"
41
+ "@dxos/storybook-utils": "0.6.12-main.2d19bf1"
39
42
  },
40
43
  "peerDependencies": {
41
44
  "react": "~18.2.0",
@@ -0,0 +1,165 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ import { type Extension } from '@codemirror/state';
6
+ import { EditorView, keymap } from '@codemirror/view';
7
+ import React, { type DOMAttributes, type KeyboardEvent } from 'react';
8
+
9
+ import { useThemeContext } from '@dxos/react-ui';
10
+ import {
11
+ type UseTextEditorProps,
12
+ createBasicExtensions,
13
+ createThemeExtensions,
14
+ preventNewline,
15
+ useTextEditor,
16
+ } from '@dxos/react-ui-editor';
17
+
18
+ import { type GridEditBox } from '../Grid';
19
+
20
+ type EditorKeyEvent = Pick<KeyboardEvent<HTMLInputElement>, 'key'> & { shift?: boolean };
21
+
22
+ export type EditorKeysProps = {
23
+ onClose: (value: string | undefined, event: EditorKeyEvent) => void;
24
+ onNav?: (value: string | undefined, event: EditorKeyEvent) => void;
25
+ };
26
+
27
+ // TODO(Zan): Should each consumer be responsible for defining these?
28
+ export const editorKeys = ({ onNav, onClose }: EditorKeysProps): Extension => {
29
+ return keymap.of([
30
+ {
31
+ key: 'ArrowUp',
32
+ run: (editor) => {
33
+ const value = editor.state.doc.toString();
34
+ onNav?.(value, { key: 'ArrowUp' });
35
+ return !!onNav;
36
+ },
37
+ },
38
+ {
39
+ key: 'ArrowDown',
40
+ run: (editor) => {
41
+ const value = editor.state.doc.toString();
42
+ onNav?.(value, { key: 'ArrowDown' });
43
+ return !!onNav;
44
+ },
45
+ },
46
+ {
47
+ key: 'ArrowLeft',
48
+ run: (editor) => {
49
+ const value = editor.state.doc.toString();
50
+ onNav?.(value, { key: 'ArrowLeft' });
51
+ return !!onNav;
52
+ },
53
+ },
54
+ {
55
+ key: 'ArrowRight',
56
+ run: (editor) => {
57
+ const value = editor.state.doc.toString();
58
+ onNav?.(value, { key: 'ArrowRight' });
59
+ return !!onNav;
60
+ },
61
+ },
62
+ {
63
+ key: 'Enter',
64
+ run: (editor) => {
65
+ onClose(editor.state.doc.toString(), { key: 'Enter' });
66
+ return true;
67
+ },
68
+ shift: (editor) => {
69
+ onClose(editor.state.doc.toString(), { key: 'Enter', shift: true });
70
+ return true;
71
+ },
72
+ },
73
+ {
74
+ key: 'Tab',
75
+ run: (editor) => {
76
+ onClose(editor.state.doc.toString(), { key: 'Tab' });
77
+ return true;
78
+ },
79
+ shift: (editor) => {
80
+ onClose(editor.state.doc.toString(), { key: 'Tab', shift: true });
81
+ return true;
82
+ },
83
+ },
84
+ {
85
+ key: 'Escape',
86
+ run: () => {
87
+ onClose(undefined, { key: 'Escape' });
88
+ return true;
89
+ },
90
+ },
91
+ ]);
92
+ };
93
+
94
+ export type CellEditorProps = {
95
+ value?: string;
96
+ extension?: Extension;
97
+ variant?: keyof typeof editorVariants;
98
+ box?: GridEditBox;
99
+ gridId?: string;
100
+ } & Pick<UseTextEditorProps, 'autoFocus'> &
101
+ Pick<DOMAttributes<HTMLInputElement>, 'onBlur' | 'onKeyDown'>;
102
+
103
+ const editorVariants = {
104
+ // TODO(thure): remove when legacy is no longer used.
105
+ legacy: {
106
+ root: 'flex w-full',
107
+ editor: 'flex w-full [&>.cm-scroller]:scrollbar-none',
108
+ content: '!px-2 !py-1',
109
+ },
110
+ grid: {
111
+ root: 'absolute z-[1]',
112
+ editor: '[&>.cm-scroller]:scrollbar-none tabular-nums',
113
+ content: '!border !border-transparent !p-0.5',
114
+ },
115
+ };
116
+
117
+ export const CellEditor = ({
118
+ value,
119
+ extension,
120
+ autoFocus,
121
+ onBlur,
122
+ variant = 'legacy',
123
+ box,
124
+ gridId,
125
+ }: CellEditorProps) => {
126
+ const { themeMode } = useThemeContext();
127
+ const { parentRef } = useTextEditor(() => {
128
+ return {
129
+ autoFocus,
130
+ initialValue: value,
131
+ selection: { anchor: value?.length ?? 0 },
132
+ extensions: [
133
+ extension ?? [],
134
+ preventNewline,
135
+ EditorView.focusChangeEffect.of((_, focusing) => {
136
+ if (!focusing) {
137
+ onBlur?.({ type: 'blur' } as any);
138
+ }
139
+ return null;
140
+ }),
141
+ createBasicExtensions({ lineWrapping: false }),
142
+ createThemeExtensions({
143
+ themeMode,
144
+ slots: {
145
+ editor: {
146
+ className: editorVariants[variant].editor,
147
+ },
148
+ content: {
149
+ className: editorVariants[variant].content,
150
+ },
151
+ },
152
+ }),
153
+ ],
154
+ };
155
+ }, [extension, autoFocus, value, variant, onBlur]);
156
+
157
+ return (
158
+ <div
159
+ ref={parentRef}
160
+ className={editorVariants[variant].root}
161
+ style={box}
162
+ {...(gridId && { 'data-grid': gridId })}
163
+ />
164
+ );
165
+ };
@@ -0,0 +1,28 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ import React from 'react';
6
+
7
+ import { CellEditor, type CellEditorProps } from './CellEditor';
8
+ import { type GridScopedProps, useGridContext } from '../Grid';
9
+
10
+ export const GridCellEditor = ({
11
+ extension,
12
+ getCellContent,
13
+ __gridScope,
14
+ }: GridScopedProps<Pick<CellEditorProps, 'extension'> & { getCellContent: (index: string) => string | undefined }>) => {
15
+ const { id, editing, setEditing, editBox } = useGridContext('GridSheetCellEditor', __gridScope);
16
+
17
+ return editing ? (
18
+ <CellEditor
19
+ variant='grid'
20
+ value={editing.initialContent ?? getCellContent(editing.index)}
21
+ autoFocus
22
+ box={editBox}
23
+ onBlur={() => setEditing(null)}
24
+ extension={extension}
25
+ gridId={id}
26
+ />
27
+ ) : null;
28
+ };
@@ -0,0 +1,6 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ export * from './CellEditor';
6
+ export * from './GridCellEditor';
@@ -30,26 +30,34 @@ export default {
30
30
  export const Basic = {
31
31
  args: {
32
32
  id: 'story',
33
- cells: {
34
- '1,1': {
35
- // end: '8,1',
36
- value: 'Weekly sales report',
33
+ initialCells: {
34
+ grid: {
35
+ '1,1': {
36
+ // end: '8,1',
37
+ value: 'Weekly sales report',
38
+ },
37
39
  },
38
40
  },
39
41
  columnDefault: {
40
- size: 180,
41
- resizeable: true,
42
+ grid: {
43
+ size: 180,
44
+ resizeable: true,
45
+ },
42
46
  },
43
47
  rowDefault: {
44
- size: 32,
45
- resizeable: true,
48
+ grid: {
49
+ size: 32,
50
+ resizeable: true,
51
+ },
46
52
  },
47
53
  columns: {
48
- 0: { size: 200 },
49
- 1: { size: 210 },
50
- 2: { size: 230 },
51
- 3: { size: 250 },
52
- 4: { size: 270 },
54
+ grid: {
55
+ 0: { size: 200 },
56
+ 1: { size: 210 },
57
+ 2: { size: 230 },
58
+ 3: { size: 250 },
59
+ 4: { size: 270 },
60
+ },
53
61
  },
54
62
  onAxisResize: (event) => {
55
63
  console.log('[axis resize]', event);
package/src/Grid.tsx CHANGED
@@ -7,9 +7,17 @@ import '@dxos/lit-grid/dx-grid.pcss';
7
7
  import { createComponent, type EventName } from '@lit/react';
8
8
  import { createContextScope, type Scope } from '@radix-ui/react-context';
9
9
  import { useControllableState } from '@radix-ui/react-use-controllable-state';
10
- import React, { type ComponentProps, forwardRef, type PropsWithChildren, useCallback, useState } from 'react';
10
+ import React, {
11
+ type ComponentProps,
12
+ forwardRef,
13
+ type PropsWithChildren,
14
+ useCallback,
15
+ useLayoutEffect,
16
+ useState,
17
+ } from 'react';
11
18
 
12
19
  import { type DxAxisResize, type DxEditRequest, type DxGridCellsSelect, DxGrid as NaturalDxGrid } from '@dxos/lit-grid';
20
+ import { useForwardedRef } from '@dxos/react-ui';
13
21
 
14
22
  type DxGridElement = NaturalDxGrid;
15
23
 
@@ -89,19 +97,30 @@ const GridRoot = ({
89
97
 
90
98
  GridRoot.displayName = GRID_NAME;
91
99
 
92
- type GridContentProps = Omit<ComponentProps<typeof DxGrid>, 'onEdit'>;
100
+ type GridContentProps = Omit<ComponentProps<typeof DxGrid>, 'onEdit'> & {
101
+ getCells?: NonNullable<NaturalDxGrid['getCells']>;
102
+ };
93
103
 
94
104
  const GRID_CONTENT_NAME = 'GridContent';
95
105
 
96
106
  const GridContent = forwardRef<NaturalDxGrid, GridScopedProps<GridContentProps>>((props, forwardedRef) => {
97
107
  const { id, editing, setEditBox, setEditing } = useGridContext(GRID_CONTENT_NAME, props.__gridScope);
108
+ const dxGrid = useForwardedRef(forwardedRef);
109
+
110
+ // Needed instead of `useEffect` to ensure the DxGrid ref is defined.
111
+ useLayoutEffect(() => {
112
+ if (dxGrid.current && props.getCells) {
113
+ dxGrid.current.getCells = props.getCells;
114
+ dxGrid.current.requestUpdate('initialCells');
115
+ }
116
+ }, [props.getCells]);
98
117
 
99
118
  const handleEdit = useCallback((event: DxEditRequest) => {
100
119
  setEditBox(event.cellBox);
101
120
  setEditing({ index: event.cellIndex, initialContent: event.initialContent });
102
121
  }, []);
103
122
 
104
- return <DxGrid {...props} gridId={id} mode={editing ? 'edit' : 'browse'} onEdit={handleEdit} ref={forwardedRef} />;
123
+ return <DxGrid {...props} gridId={id} mode={editing ? 'edit' : 'browse'} onEdit={handleEdit} ref={dxGrid} />;
105
124
  });
106
125
 
107
126
  GridContent.displayName = GRID_CONTENT_NAME;
@@ -114,3 +133,16 @@ export const Grid = {
114
133
  export { GridRoot, GridContent, useGridContext, createGridScope };
115
134
 
116
135
  export type { GridRootProps, GridContentProps, GridEditing, GridEditBox, GridScopedProps, DxGridElement };
136
+
137
+ export { colToA1Notation, rowToA1Notation, closestCell } from '@dxos/lit-grid';
138
+
139
+ export type {
140
+ DxGridRange,
141
+ DxGridAxisMeta,
142
+ DxAxisResize,
143
+ DxGridCells,
144
+ DxGridPlaneRange,
145
+ DxGridPlaneCells,
146
+ DxGridPlane,
147
+ DxGridPosition,
148
+ } from '@dxos/lit-grid';
package/src/index.ts CHANGED
@@ -3,3 +3,4 @@
3
3
  //
4
4
 
5
5
  export * from './Grid';
6
+ export * from './CellEditor';