@dxos/react-ui-grid 0.6.12-main.15a606f → 0.6.12-main.568932b
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.
- package/dist/lib/browser/index.mjs +15 -2
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/types/src/Grid.d.ts +5 -1
- package/dist/types/src/Grid.d.ts.map +1 -1
- package/dist/types/src/Grid.stories.d.ts +29 -21
- package/dist/types/src/Grid.stories.d.ts.map +1 -1
- package/package.json +6 -6
- package/src/Grid.stories.tsx +21 -13
- package/src/Grid.tsx +33 -3
|
@@ -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 } 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:
|
|
70
|
+
ref: dxGrid
|
|
60
71
|
});
|
|
61
72
|
});
|
|
62
73
|
GridContent.displayName = GRID_CONTENT_NAME;
|
|
@@ -68,7 +79,9 @@ export {
|
|
|
68
79
|
Grid,
|
|
69
80
|
GridContent,
|
|
70
81
|
GridRoot,
|
|
82
|
+
colToA1Notation,
|
|
71
83
|
createGridScope,
|
|
84
|
+
rowToA1Notation,
|
|
72
85
|
useGridContext
|
|
73
86
|
};
|
|
74
87
|
//# sourceMappingURL=index.mjs.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
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, {
|
|
5
|
-
"mappings": ";AAIA,OAAO;AAEP,SAASA,uBAAuC;AAChD,SAASC,0BAAsC;AAC/C,SAASC,4BAA4B;AACrC,OAAOC,
|
|
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"]
|
|
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 } from '@dxos/lit-grid';\n\nexport type {\n DxGridRange,\n DxGridAxisMeta,\n DxGridCells,\n DxGridPlaneRange,\n DxGridPlaneCells,\n DxGridPlane,\n} from '@dxos/lit-grid';\n"],
|
|
5
|
+
"mappings": ";AAIA,OAAO;AAEP,SAASA,uBAAuC;AAChD,SAASC,0BAAsC;AAC/C,SAASC,4BAA4B;AACrC,OAAOC,SAELC,YAEAC,aACAC,iBACAC,gBACK;AAEP,SAAwEC,UAAUC,qBAAqB;AACvG,SAASC,uBAAuB;AAqHhC,SAASC,iBAAiBC,uBAAuB;AAjHjD,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;AAMvB,IAAMwB,oBAAoB;AAE1B,IAAMC,cAAcC,2BAA6D,CAACC,OAAOC,iBAAAA;AACvF,QAAM,EAAErB,IAAIC,SAASY,YAAYN,WAAU,IAAKT,eAAemB,mBAAmBG,MAAMd,WAAW;AACnG,QAAMgB,SAASC,gBAAgBF,YAAAA;AAG/BG,kBAAgB,MAAA;AACd,QAAIF,OAAOG,WAAWL,MAAMM,UAAU;AACpCJ,aAAOG,QAAQC,WAAWN,MAAMM;AAChCJ,aAAOG,QAAQE,cAAc,cAAA;IAC/B;EACF,GAAG;IAACP,MAAMM;GAAS;AAEnB,QAAME,aAAaC,YAAY,CAACC,UAAAA;AAC9BjB,eAAWiB,MAAMC,OAAO;AACxBxB,eAAW;MAAEyB,OAAOF,MAAMG;MAAWC,gBAAgBJ,MAAMI;IAAe,CAAA;EAC5E,GAAG,CAAA,CAAE;AAEL,SAAO,sBAAA,cAACzD,QAAAA;IAAQ,GAAG2C;IAAOe,QAAQnC;IAAIoC,MAAMnC,UAAU,SAAS;IAAUf,QAAQ0C;IAAYS,KAAKf;;AACpG,CAAA;AAEAJ,YAAYF,cAAcC;AAEnB,IAAMqB,OAAO;EAClBC,MAAMxC;EACNyC,SAAStB;AACX;",
|
|
6
|
+
"names": ["createComponent", "createContextScope", "useControllableState", "React", "forwardRef", "useCallback", "useLayoutEffect", "useState", "DxGrid", "NaturalDxGrid", "useForwardedRef", "colToA1Notation", "rowToA1Notation", "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"]
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"packages/ui/react-ui-grid/src/Grid.tsx":{"bytes":
|
|
1
|
+
{"inputs":{"packages/ui/react-ui-grid/src/Grid.tsx":{"bytes":12216,"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/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":6859},"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}],"exports":["Grid","GridContent","GridRoot","colToA1Notation","createGridScope","rowToA1Notation","useGridContext"],"entryPoint":"packages/ui/react-ui-grid/src/index.ts","inputs":{"packages/ui/react-ui-grid/src/Grid.tsx":{"bytesInOutput":2427},"packages/ui/react-ui-grid/src/index.ts":{"bytesInOutput":0}},"bytes":2625}}}
|
package/dist/types/src/Grid.d.ts
CHANGED
|
@@ -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 } from '@dxos/lit-grid';
|
|
54
|
+
export type { DxGridRange, DxGridAxisMeta, DxGridCells, DxGridPlaneRange, DxGridPlaneCells, DxGridPlane, } 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,
|
|
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,MAAM,gBAAgB,CAAC;AAElE,YAAY,EACV,WAAW,EACX,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,GACZ,MAAM,gBAAgB,CAAC"}
|
|
@@ -14,34 +14,42 @@ export default _default;
|
|
|
14
14
|
export declare const Basic: {
|
|
15
15
|
args: {
|
|
16
16
|
id: string;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
initialCells: {
|
|
18
|
+
grid: {
|
|
19
|
+
'1,1': {
|
|
20
|
+
value: string;
|
|
21
|
+
};
|
|
20
22
|
};
|
|
21
23
|
};
|
|
22
24
|
columnDefault: {
|
|
23
|
-
|
|
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
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
2: {
|
|
38
|
-
size: number;
|
|
39
|
-
};
|
|
40
|
-
3: {
|
|
29
|
+
};
|
|
30
|
+
rowDefault: {
|
|
31
|
+
grid: {
|
|
41
32
|
size: number;
|
|
33
|
+
resizeable: true;
|
|
42
34
|
};
|
|
43
|
-
|
|
44
|
-
|
|
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
55
|
onAxisResize: (event: import("packages/ui/lit-grid/dist/types/src").DxAxisResize) => void;
|
|
@@ -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
|
|
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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/react-ui-grid",
|
|
3
|
-
"version": "0.6.12-main.
|
|
3
|
+
"version": "0.6.12-main.568932b",
|
|
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",
|
|
@@ -24,10 +24,10 @@
|
|
|
24
24
|
"@lit/react": "^1.0.5",
|
|
25
25
|
"@radix-ui/react-context": "^1.0.0",
|
|
26
26
|
"@radix-ui/react-use-controllable-state": "^1.0.0",
|
|
27
|
-
"@dxos/lit-grid": "0.6.12-main.
|
|
28
|
-
"@dxos/react-ui": "0.6.12-main.
|
|
29
|
-
"@dxos/react-ui-theme": "0.6.12-main.
|
|
30
|
-
"@dxos/util": "0.6.12-main.
|
|
27
|
+
"@dxos/lit-grid": "0.6.12-main.568932b",
|
|
28
|
+
"@dxos/react-ui": "0.6.12-main.568932b",
|
|
29
|
+
"@dxos/react-ui-theme": "0.6.12-main.568932b",
|
|
30
|
+
"@dxos/util": "0.6.12-main.568932b"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"@types/react": "~18.2.0",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"react": "~18.2.0",
|
|
36
36
|
"react-dom": "~18.2.0",
|
|
37
37
|
"vite": "5.4.7",
|
|
38
|
-
"@dxos/storybook-utils": "0.6.12-main.
|
|
38
|
+
"@dxos/storybook-utils": "0.6.12-main.568932b"
|
|
39
39
|
},
|
|
40
40
|
"peerDependencies": {
|
|
41
41
|
"react": "~18.2.0",
|
package/src/Grid.stories.tsx
CHANGED
|
@@ -30,26 +30,34 @@ export default {
|
|
|
30
30
|
export const Basic = {
|
|
31
31
|
args: {
|
|
32
32
|
id: 'story',
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
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
|
-
|
|
41
|
-
|
|
42
|
+
grid: {
|
|
43
|
+
size: 180,
|
|
44
|
+
resizeable: true,
|
|
45
|
+
},
|
|
42
46
|
},
|
|
43
47
|
rowDefault: {
|
|
44
|
-
|
|
45
|
-
|
|
48
|
+
grid: {
|
|
49
|
+
size: 32,
|
|
50
|
+
resizeable: true,
|
|
51
|
+
},
|
|
46
52
|
},
|
|
47
53
|
columns: {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
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, {
|
|
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={
|
|
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,14 @@ 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 } from '@dxos/lit-grid';
|
|
138
|
+
|
|
139
|
+
export type {
|
|
140
|
+
DxGridRange,
|
|
141
|
+
DxGridAxisMeta,
|
|
142
|
+
DxGridCells,
|
|
143
|
+
DxGridPlaneRange,
|
|
144
|
+
DxGridPlaneCells,
|
|
145
|
+
DxGridPlane,
|
|
146
|
+
} from '@dxos/lit-grid';
|