@macrostrat/data-sheet 4.0.0-dev3 → 4.0.1
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/CHANGELOG.md +56 -0
- package/README.md +44 -0
- package/dist/actions/builtin.cjs +36 -5
- package/dist/actions/builtin.cjs.map +1 -1
- package/dist/actions/builtin.d.ts +3 -2
- package/dist/actions/builtin.js +36 -5
- package/dist/actions/builtin.js.map +1 -1
- package/dist/actions/column-controls.cjs +149 -0
- package/dist/actions/column-controls.cjs.map +1 -0
- package/dist/actions/column-controls.d.ts +11 -0
- package/dist/actions/column-controls.js +147 -0
- package/dist/actions/column-controls.js.map +1 -0
- package/dist/actions/column-filter.cjs +68 -0
- package/dist/actions/column-filter.cjs.map +1 -0
- package/dist/actions/column-filter.d.ts +11 -0
- package/dist/actions/column-filter.js +66 -0
- package/dist/actions/column-filter.js.map +1 -0
- package/dist/actions/edit-actions.cjs +42 -0
- package/dist/actions/edit-actions.cjs.map +1 -0
- package/dist/actions/edit-actions.d.ts +14 -0
- package/dist/actions/edit-actions.js +42 -0
- package/dist/actions/edit-actions.js.map +1 -0
- package/dist/actions/filters.cjs +39 -23
- package/dist/actions/filters.cjs.map +1 -1
- package/dist/actions/filters.d.ts +6 -3
- package/dist/actions/filters.js +41 -25
- package/dist/actions/filters.js.map +1 -1
- package/dist/actions/index.d.ts +4 -0
- package/dist/actions/selection.cjs +51 -32
- package/dist/actions/selection.cjs.map +1 -1
- package/dist/actions/selection.d.ts +3 -7
- package/dist/actions/selection.js +51 -32
- package/dist/actions/selection.js.map +1 -1
- package/dist/actions/table-controls.cjs +41 -0
- package/dist/actions/table-controls.cjs.map +1 -0
- package/dist/actions/table-controls.d.ts +4 -0
- package/dist/actions/table-controls.js +39 -0
- package/dist/actions/table-controls.js.map +1 -0
- package/dist/actions/toolbar.cjs +69 -10
- package/dist/actions/toolbar.cjs.map +1 -1
- package/dist/actions/toolbar.d.ts +9 -6
- package/dist/actions/toolbar.js +69 -10
- package/dist/actions/toolbar.js.map +1 -1
- package/dist/actions/toolbar.module.sass.cjs +12 -7
- package/dist/actions/toolbar.module.sass.cjs.map +1 -1
- package/dist/actions/toolbar.module.sass.js +12 -7
- package/dist/actions/toolbar.module.sass.js.map +1 -1
- package/dist/actions/types.d.ts +49 -4
- package/dist/cell-renderer.cjs +150 -14
- package/dist/cell-renderer.cjs.map +1 -1
- package/dist/cell-renderer.d.ts +1 -1
- package/dist/cell-renderer.js +151 -15
- package/dist/cell-renderer.js.map +1 -1
- package/dist/components/cell-detail.cjs +24 -0
- package/dist/components/cell-detail.cjs.map +1 -0
- package/dist/components/cell-detail.d.ts +12 -0
- package/dist/components/cell-detail.js +24 -0
- package/dist/components/cell-detail.js.map +1 -0
- package/dist/components/editor-popup.cjs +28 -24
- package/dist/components/editor-popup.cjs.map +1 -1
- package/dist/components/editor-popup.js +29 -25
- package/dist/components/editor-popup.js.map +1 -1
- package/dist/components/index.d.ts +2 -2
- package/dist/components/text-areas.cjs +51 -7
- package/dist/components/text-areas.cjs.map +1 -1
- package/dist/components/text-areas.d.ts +4 -1
- package/dist/components/text-areas.js +51 -7
- package/dist/components/text-areas.js.map +1 -1
- package/dist/components/view-info.cjs +46 -9
- package/dist/components/view-info.cjs.map +1 -1
- package/dist/components/view-info.d.ts +5 -1
- package/dist/components/view-info.js +47 -10
- package/dist/components/view-info.js.map +1 -1
- package/dist/core.cjs +167 -73
- package/dist/core.cjs.map +1 -1
- package/dist/core.d.ts +53 -6
- package/dist/core.js +169 -75
- package/dist/core.js.map +1 -1
- package/dist/data-sheet.css +72 -123
- package/dist/filters/operators.cjs +91 -0
- package/dist/filters/operators.cjs.map +1 -0
- package/dist/filters/operators.d.ts +17 -0
- package/dist/filters/operators.js +91 -0
- package/dist/filters/operators.js.map +1 -0
- package/dist/index.cjs +38 -10
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.js +44 -16
- package/dist/index.js.map +1 -1
- package/dist/main.module.sass.cjs +13 -12
- package/dist/main.module.sass.cjs.map +1 -1
- package/dist/main.module.sass.js +13 -12
- package/dist/main.module.sass.js.map +1 -1
- package/dist/postgrest-table/data-loaders.cjs +255 -146
- package/dist/postgrest-table/data-loaders.cjs.map +1 -1
- package/dist/postgrest-table/data-loaders.d.ts +144 -46
- package/dist/postgrest-table/data-loaders.js +259 -150
- package/dist/postgrest-table/data-loaders.js.map +1 -1
- package/dist/postgrest-table/index.cjs +58 -169
- package/dist/postgrest-table/index.cjs.map +1 -1
- package/dist/postgrest-table/index.d.ts +5 -2
- package/dist/postgrest-table/index.js +63 -174
- package/dist/postgrest-table/index.js.map +1 -1
- package/dist/postgrest-table/loading-utils.cjs +0 -4
- package/dist/postgrest-table/loading-utils.cjs.map +1 -1
- package/dist/postgrest-table/loading-utils.js +1 -5
- package/dist/postgrest-table/loading-utils.js.map +1 -1
- package/dist/postgrest-table/main.module.sass.cjs +14 -13
- package/dist/postgrest-table/main.module.sass.cjs.map +1 -1
- package/dist/postgrest-table/main.module.sass.js +14 -13
- package/dist/postgrest-table/main.module.sass.js.map +1 -1
- package/dist/provider.cjs +68 -11
- package/dist/provider.cjs.map +1 -1
- package/dist/provider.d.ts +25 -0
- package/dist/provider.js +68 -11
- package/dist/provider.js.map +1 -1
- package/dist/renderers/column-header-cell.cjs +95 -75
- package/dist/renderers/column-header-cell.cjs.map +1 -1
- package/dist/renderers/column-header-cell.d.ts +3 -18
- package/dist/renderers/column-header-cell.js +98 -78
- package/dist/renderers/column-header-cell.js.map +1 -1
- package/dist/renderers/index.d.ts +0 -1
- package/dist/types.cjs +2 -0
- package/dist/types.cjs.map +1 -1
- package/dist/types.d.ts +84 -1
- package/dist/types.js +2 -0
- package/dist/types.js.map +1 -1
- package/dist/utils/column-spec.cjs.map +1 -1
- package/dist/utils/column-spec.d.ts +101 -1
- package/dist/utils/column-spec.js.map +1 -1
- package/dist/utils/debug-overlay.cjs +24 -0
- package/dist/utils/debug-overlay.cjs.map +1 -0
- package/dist/utils/debug-overlay.d.ts +4 -0
- package/dist/utils/debug-overlay.js +24 -0
- package/dist/utils/debug-overlay.js.map +1 -0
- package/dist/utils/index.cjs.map +1 -1
- package/dist/utils/index.d.ts +2 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/utils/key-handling.cjs +52 -6
- package/dist/utils/key-handling.cjs.map +1 -1
- package/dist/utils/key-handling.js +52 -6
- package/dist/utils/key-handling.js.map +1 -1
- package/dist/utils/validation.cjs +41 -0
- package/dist/utils/validation.cjs.map +1 -0
- package/dist/utils/validation.d.ts +26 -0
- package/dist/utils/validation.js +41 -0
- package/dist/utils/validation.js.map +1 -0
- package/dist/zustand-store.cjs +119 -61
- package/dist/zustand-store.cjs.map +1 -1
- package/dist/zustand-store.js +121 -63
- package/dist/zustand-store.js.map +1 -1
- package/package.json +3 -3
- package/src/actions/builtin.ts +62 -7
- package/src/actions/column-controls.ts +185 -0
- package/src/actions/column-filter.ts +104 -0
- package/src/actions/edit-actions.ts +67 -0
- package/src/actions/filters.ts +54 -28
- package/src/actions/index.ts +4 -0
- package/src/actions/selection.ts +73 -54
- package/src/actions/table-controls.ts +46 -0
- package/src/actions/toolbar.module.sass +22 -2
- package/src/actions/toolbar.ts +113 -16
- package/src/actions/types.ts +49 -4
- package/src/cell-renderer.ts +211 -16
- package/src/components/cell-detail.ts +30 -0
- package/src/components/editor-popup.ts +39 -25
- package/src/components/index.ts +2 -2
- package/src/components/text-areas.ts +80 -16
- package/src/components/view-info.ts +63 -4
- package/src/core.ts +321 -103
- package/src/filters/operators.ts +127 -0
- package/src/index.ts +2 -0
- package/src/main.module.sass +6 -0
- package/src/postgrest-table/data-loaders.ts +459 -209
- package/src/postgrest-table/index.ts +81 -254
- package/src/postgrest-table/main.module.sass +11 -0
- package/src/provider.ts +109 -12
- package/src/renderers/column-header-cell.ts +60 -272
- package/src/renderers/index.ts +0 -1
- package/src/types.ts +76 -2
- package/src/utils/column-spec.ts +112 -1
- package/src/utils/debug-overlay.ts +22 -0
- package/src/utils/index.ts +2 -0
- package/src/utils/key-handling.ts +70 -6
- package/src/utils/validation.ts +72 -0
- package/src/zustand-store.ts +167 -60
- package/dist/components/actions.cjs +0 -12
- package/dist/components/actions.cjs.map +0 -1
- package/dist/components/actions.d.ts +0 -2
- package/dist/components/actions.js +0 -12
- package/dist/components/actions.js.map +0 -1
- package/dist/components/actions.module.sass.cjs +0 -12
- package/dist/components/actions.module.sass.cjs.map +0 -1
- package/dist/components/actions.module.sass.js +0 -11
- package/dist/components/actions.module.sass.js.map +0 -1
- package/dist/postgrest-table/lazy-loader-table.cjs +0 -27
- package/dist/postgrest-table/lazy-loader-table.cjs.map +0 -1
- package/dist/postgrest-table/lazy-loader-table.d.ts +0 -3
- package/dist/postgrest-table/lazy-loader-table.js +0 -27
- package/dist/postgrest-table/lazy-loader-table.js.map +0 -1
- package/dist/renderers/column-header-cell-postgrest.cjs +0 -216
- package/dist/renderers/column-header-cell-postgrest.cjs.map +0 -1
- package/dist/renderers/column-header-cell-postgrest.d.ts +0 -13
- package/dist/renderers/column-header-cell-postgrest.js +0 -216
- package/dist/renderers/column-header-cell-postgrest.js.map +0 -1
- package/dist/renderers/column-header-cell-postgrest.module.sass.cjs +0 -23
- package/dist/renderers/column-header-cell-postgrest.module.sass.cjs.map +0 -1
- package/dist/renderers/column-header-cell-postgrest.module.sass.js +0 -22
- package/dist/renderers/column-header-cell-postgrest.module.sass.js.map +0 -1
- package/src/components/actions.ts +0 -9
- package/src/postgrest-table/lazy-loader-table.ts +0 -25
- package/src/renderers/column-header-cell-postgrest.ts +0 -282
package/dist/provider.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.cjs","sources":["../src/provider.ts"],"sourcesContent":["import { SetStateAction, useEffect, useRef, useState } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { createStore, StoreApi, useStore } from \"zustand\";\nimport type { Table } from \"@blueprintjs/table\";\nimport { generateColumnSpec } from \"./utils\";\nimport { createScopedStore } from \"@macrostrat/data-components\";\nimport {\n DataSheetProviderProps,\n DataSheetState,\n DataSheetStore,\n} from \"./types.ts\";\nimport { createZustandStore } from \"./zustand-store.ts\";\nimport { atomWithStore } from \"jotai-zustand\";\nimport { toasterAtom } from \"./notifications.ts\";\nimport { TableAction } from \"./actions\";\nimport { atom } from \"jotai\";\n\n/** Create a Jotai scoped store */\nexport const ctx = createScopedStore();\n\nexport const storeAPIAtom = atom<StoreApi<DataSheetStore<any>>>();\n\nconst storeWrapperAtom = atom((get) => {\n const _storeAPIAtom = get(storeAPIAtom);\n if (_storeAPIAtom == null) {\n return undefined;\n }\n return atomWithStore(_storeAPIAtom);\n});\n\n/** This is the basis for all other atoms that manipulate the store. */\nexport const storeAtom = atom(\n (get) => {\n const storeWrapper = get(storeWrapperAtom);\n if (storeWrapper == null) {\n return undefined;\n }\n return get(storeWrapper);\n },\n (get, set, action: SetStateAction<T>) => {\n const storeWrapper = get(storeWrapperAtom);\n if (storeWrapper == null) {\n throw new Error(\"Missing DataSheetProvider\");\n }\n return set(storeWrapper, action);\n },\n);\n\nconst initializeStoreAtom = atom(\n null,\n (get, set, payload: Partial<DataSheetStore<T>>) => {\n set(storeAtom, (state) => {\n return {\n ...state,\n ...payload,\n };\n });\n },\n);\n\nexport const tableActionsAtom = atom<TableAction[]>([]);\n\nexport function DataSheetProvider<T>(props: DataSheetProviderProps<T>) {\n const { toaster, ...rest } = props;\n const [store] = useState(() => {\n return createStore<DataSheetStore<T>>(createZustandStore);\n });\n return h(\n ctx.Provider,\n {\n atoms: [\n [storeAPIAtom, store],\n [toasterAtom, toaster],\n ],\n },\n h(DataSheetProviderInner, rest),\n );\n}\n\nexport function DataSheetProviderInner<T>({\n children,\n data,\n columnSpec,\n columnSpecOptions,\n editable,\n enableColumnReordering,\n defaultColumnWidth = 150,\n}: DataSheetProviderProps<T>) {\n const tableRef = useRef<Table>(null);\n\n const initializeStore = ctx.useSet(initializeStoreAtom);\n\n // Not sure how required this initialization is\n useEffect(() => {\n initializeStore({\n columnSpec: columnSpec ?? generateColumnSpec(data, columnSpecOptions),\n editable,\n enableColumnReordering,\n data,\n defaultColumnWidth,\n tableRef,\n });\n }, [data, editable, columnSpec, columnSpecOptions, enableColumnReordering]);\n\n return children;\n}\n\nexport function useStoreAPI<T>(): StoreApi<DataSheetStore<T>> {\n const store = ctx.useValue(storeAPIAtom);\n if (!store) {\n throw new Error(\"Missing DataSheetProvider\");\n }\n return store;\n}\n\nexport function useSelector<T = any, A = any>(\n selector: (state: DataSheetStore<T> & DataSheetComputedVals) => A,\n): A {\n const store = useStoreAPI<T>();\n return useStore(store, selector);\n}\n/** Atoms for efficient sub-selection of state */\n\nexport const columnSpecAtom = atom((get) => get(storeAtom)?.columnSpec ?? []);\n\nexport const tableDataAtom = atom(\n (get) => {\n return get(storeAtom)?.data ?? [];\n },\n (get, set, newData: any[]) => {\n set(storeAtom, (state: DataSheetState<any>): DataSheetState<any> => {\n console.log(\"Updating table data\", newData);\n if (\n state.data.length == 0 &&\n newData.length > 0 &&\n state.columnSpec.length == 0\n ) {\n console.log(\"Generating column spec from data\");\n /** We haven't yet generated the column spec, and we need to do so. TODO: we may be able to forestall this with loading state */\n return {\n ...state,\n columnSpec: generateColumnSpec(newData, state.columnSpecOptions),\n data: newData,\n };\n }\n\n return {\n ...state,\n data: newData,\n };\n });\n },\n);\n"],"names":["createScopedStore","atom","atomWithStore","useState","createStore","createZustandStore","h","toasterAtom","columnSpec","useRef","useEffect","generateColumnSpec","useStore"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"provider.cjs","sources":["../src/provider.ts"],"sourcesContent":["import { SetStateAction, useEffect, useRef, useState } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { createStore, StoreApi, useStore } from \"zustand\";\nimport type { Table } from \"@blueprintjs/table\";\nimport { generateColumnSpec } from \"./utils\";\nimport { createScopedStore } from \"@macrostrat/data-components\";\nimport {\n DataSheetProviderProps,\n DataSheetState,\n DataSheetStore,\n DS_ROW_ID,\n TableElementStatus,\n} from \"./types.ts\";\nimport { createZustandStore } from \"./zustand-store.ts\";\nimport { atomWithStore } from \"jotai-zustand\";\nimport { toasterAtom } from \"./notifications.ts\";\nimport { TableAction } from \"./actions\";\nimport { atom } from \"jotai\";\n\n/** Create a Jotai scoped store */\nexport const ctx = createScopedStore();\n\nexport const storeAPIAtom = atom<StoreApi<DataSheetStore<any>>>();\n\nconst storeWrapperAtom = atom((get) => {\n const _storeAPIAtom = get(storeAPIAtom);\n if (_storeAPIAtom == null) {\n return undefined;\n }\n return atomWithStore(_storeAPIAtom);\n});\n\n/** This is the basis for all other atoms that manipulate the store. */\nexport const storeAtom = atom(\n (get) => {\n const storeWrapper = get(storeWrapperAtom);\n if (storeWrapper == null) {\n return undefined;\n }\n return get(storeWrapper);\n },\n (get, set, action: SetStateAction<T>) => {\n const storeWrapper = get(storeWrapperAtom);\n if (storeWrapper == null) {\n throw new Error(\"Missing DataSheetProvider\");\n }\n return set(storeWrapper, action);\n },\n);\n\nconst initializeStoreAtom = atom(\n null,\n (get, set, payload: Partial<DataSheetStore<T>>) => {\n set(storeAtom, (state) => {\n return {\n ...state,\n ...payload,\n };\n });\n },\n);\n\nexport const tableActionsAtom = atom<TableAction[]>([]);\n\nexport function DataSheetProvider<T>(props: DataSheetProviderProps<T>) {\n const { toaster, ...rest } = props;\n const [store] = useState(() => {\n return createStore<DataSheetStore<T>>(createZustandStore);\n });\n return h(\n ctx.Provider,\n {\n atoms: [\n [storeAPIAtom, store],\n [toasterAtom, toaster],\n ],\n },\n h(DataSheetProviderInner, rest),\n );\n}\n\nexport function DataSheetProviderInner<T>({\n children,\n data,\n columnSpec,\n columnSpecOptions,\n editable,\n enableColumnReordering,\n defaultColumnWidth = 150,\n}: DataSheetProviderProps<T>) {\n const tableRef = useRef<Table>(null);\n\n const initializeStore = ctx.useSet(initializeStoreAtom);\n\n // Not sure how required this initialization is\n useEffect(() => {\n initializeStore({\n columnSpec: columnSpec ?? generateColumnSpec(data, columnSpecOptions),\n editable,\n enableColumnReordering,\n data,\n defaultColumnWidth,\n tableRef,\n });\n }, [data, editable, columnSpec, columnSpecOptions, enableColumnReordering]);\n\n return children;\n}\n\nexport function useStoreAPI<T>(): StoreApi<DataSheetStore<T>> {\n const store = ctx.useValue(storeAPIAtom);\n if (!store) {\n throw new Error(\"Missing DataSheetProvider\");\n }\n return store;\n}\n\nexport function useSelector<T = any, A = any>(\n selector: (state: DataSheetStore<T> & DataSheetComputedVals) => A,\n): A {\n const store = useStoreAPI<T>();\n return useStore(store, selector);\n}\n/** Atoms for efficient sub-selection of state */\n\nexport const columnSpecAtom = atom((get) => get(storeAtom)?.columnSpec ?? []);\n\nexport const tableDataAtom = atom(\n (get) => {\n return get(storeAtom)?.data ?? [];\n },\n (get, set, newData: any[]) => {\n set(storeAtom, (state: DataSheetState<any>): DataSheetState<any> => {\n let next: DataSheetState<any> = { ...state, data: newData };\n if (\n state.data.length == 0 &&\n newData.length > 0 &&\n state.columnSpec.length == 0\n ) {\n // We haven't yet generated the column spec, and we need to do so.\n next.columnSpec = generateColumnSpec(newData, state.columnSpecOptions);\n }\n\n // Re-attach the edit overlay by identity. The loader replaces `data` with\n // re-ordered windows on sort/filter, so an index-keyed overlay would\n // smear; keying by identity keeps edits (and deletes) on their rows, holds\n // edits for not-yet-loaded rows, and re-appends locally-added rows (which\n // aren't in the provider's data) after it. Skipped when the consumer\n // controls the overlay (they own reconciliation).\n if (!state.controlledOverlay) {\n const remap = remapOverlayByIdentity(state, newData);\n next.data = remap.data;\n next.updatedData = remap.updatedData;\n next.rowStatus = remap.rowStatus;\n next.pendingOverlayById = remap.pending;\n }\n\n return next;\n });\n },\n);\n\ntype OverlayEntry = { edit?: any; status?: any };\n\n/** Row identity used by the overlay: an in-table-added row's synthetic id\n * (stable across its edits), else the provider/consumer `identity`. */\nfunction overlayIdentity(\n state: DataSheetState<any>,\n row: any,\n): string | number | null | undefined {\n if (row == null) return undefined;\n const added = row[DS_ROW_ID];\n if (added != null) return added;\n return state.identity(row);\n}\n\n/** Re-project the (index-keyed) edit overlay from the old `data` order onto a\n * new one, matching rows by identity. Edits/statuses whose row is absent from\n * `newData` are held in `pending` and re-applied when the row loads; rows added\n * in-table (status `ADDED`) are re-appended after the provider data (they have\n * no provider row). Starts from the prior pending set so edits survive multiple\n * re-sorts. Returns the reconstructed data (provider rows + re-appended added\n * rows) alongside the re-aligned overlay. */\nfunction remapOverlayByIdentity(\n state: DataSheetState<any>,\n newData: any[],\n): {\n data: any[];\n updatedData: any[];\n rowStatus: any[];\n pending: Map<string | number, OverlayEntry>;\n} {\n const { data: oldData, updatedData, rowStatus } = state;\n\n // Collect current overlay entries by identity, seeded with prior pending.\n const byId = new Map<string | number, OverlayEntry>(state.pendingOverlayById);\n const n = Math.max(\n oldData.length,\n updatedData?.length ?? 0,\n rowStatus?.length ?? 0,\n );\n for (let i = 0; i < n; i++) {\n const row = oldData[i];\n if (row == null) continue;\n const id = overlayIdentity(state, row);\n if (id == null) continue;\n const edit = updatedData?.[i];\n const status = rowStatus?.[i];\n if (edit != null || status != null) byId.set(id, { edit, status });\n }\n\n // Project onto the new data order.\n const resultData = newData.slice();\n const nextUpdated: any[] = [];\n const nextStatus: any[] = [];\n const attached = new Set<string | number>();\n for (let j = 0; j < resultData.length; j++) {\n const row = resultData[j];\n if (row == null) continue;\n const id = overlayIdentity(state, row);\n if (id == null) continue;\n const entry = byId.get(id);\n if (entry == null) continue;\n if (entry.edit != null) nextUpdated[j] = entry.edit;\n if (entry.status != null) nextStatus[j] = entry.status;\n attached.add(id);\n }\n\n // Re-append in-table-added rows (not present in the provider data), then hold\n // anything still unattached (rows not currently loaded) as pending.\n const pending = new Map<string | number, OverlayEntry>();\n for (const [id, entry] of byId) {\n if (attached.has(id)) continue;\n if (entry.status === TableElementStatus.ADDED) {\n const idx = resultData.length;\n resultData.push(entry.edit ?? {});\n nextUpdated[idx] = entry.edit;\n nextStatus[idx] = entry.status;\n } else {\n pending.set(id, entry);\n }\n }\n\n return {\n data: resultData,\n updatedData: nextUpdated,\n rowStatus: nextStatus,\n pending,\n };\n}\n"],"names":["createScopedStore","atom","atomWithStore","useState","createStore","createZustandStore","h","toasterAtom","columnSpec","useRef","useEffect","generateColumnSpec","useStore","DS_ROW_ID","TableElementStatus"],"mappings":";;;;;;;;;;;;;;AAoBO,MAAM,MAAMA,eAAAA,kBAAA;AAEZ,MAAM,eAAeC,MAAAA,KAAA;AAE5B,MAAM,mBAAmBA,MAAAA,KAAK,CAAC,QAAQ;AACrC,QAAM,gBAAgB,IAAI,YAAY;AACtC,MAAI,iBAAiB,MAAM;AACzB,WAAO;AAAA,EACT;AACA,SAAOC,aAAAA,cAAc,aAAa;AACpC,CAAC;AAGM,MAAM,YAAYD,MAAAA;AAAAA,EACvB,CAAC,QAAQ;AACP,UAAM,eAAe,IAAI,gBAAgB;AACzC,QAAI,gBAAgB,MAAM;AACxB,aAAO;AAAA,IACT;AACA,WAAO,IAAI,YAAY;AAAA,EACzB;AAAA,EACA,CAAC,KAAK,KAAK,WAA8B;AACvC,UAAM,eAAe,IAAI,gBAAgB;AACzC,QAAI,gBAAgB,MAAM;AACxB,YAAM,IAAI,MAAM,2BAA2B;AAAA,IAC7C;AACA,WAAO,IAAI,cAAc,MAAM;AAAA,EACjC;AACF;AAEA,MAAM,sBAAsBA,MAAAA;AAAAA,EAC1B;AAAA,EACA,CAAC,KAAK,KAAK,YAAwC;AACjD,QAAI,WAAW,CAAC,UAAU;AACxB,aAAO;AAAA,QACL,GAAG;AAAA,QACH,GAAG;AAAA,MAAA;AAAA,IAEP,CAAC;AAAA,EACH;AACF;AAEO,MAAM,mBAAmBA,MAAAA,KAAoB,CAAA,CAAE;AAE/C,SAAS,kBAAqB,OAAkC;AACrE,QAAM,EAAE,SAAS,GAAG,KAAA,IAAS;AAC7B,QAAM,CAAC,KAAK,IAAIE,MAAAA,SAAS,MAAM;AAC7B,WAAOC,QAAAA,YAA+BC,aAAAA,kBAAkB;AAAA,EAC1D,CAAC;AACD,SAAOC,WAAAA;AAAAA,IACL,IAAI;AAAA,IACJ;AAAA,MACE,OAAO;AAAA,QACL,CAAC,cAAc,KAAK;AAAA,QACpB,CAACC,cAAAA,aAAa,OAAO;AAAA,MAAA;AAAA,IACvB;AAAA,IAEFD,WAAAA,QAAE,wBAAwB,IAAI;AAAA,EAAA;AAElC;AAEO,SAAS,uBAA0B;AAAA,EACxC;AAAA,EACA;AAAA,EAAA,YACAE;AAAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,qBAAqB;AACvB,GAA8B;AAC5B,QAAM,WAAWC,MAAAA,OAAc,IAAI;AAEnC,QAAM,kBAAkB,IAAI,OAAO,mBAAmB;AAGtDC,QAAAA,UAAU,MAAM;AACd,oBAAgB;AAAA,MACd,YAAYF,gBAAcG,8BAAmB,MAAM,iBAAiB;AAAA,MACpE;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IAAA,CACD;AAAA,EACH,GAAG,CAAC,MAAM,UAAUH,cAAY,mBAAmB,sBAAsB,CAAC;AAE1E,SAAO;AACT;AAEO,SAAS,cAA8C;AAC5D,QAAM,QAAQ,IAAI,SAAS,YAAY;AACvC,MAAI,CAAC,OAAO;AACV,UAAM,IAAI,MAAM,2BAA2B;AAAA,EAC7C;AACA,SAAO;AACT;AAEO,SAAS,YACd,UACG;AACH,QAAM,QAAQ,YAAA;AACd,SAAOI,QAAAA,SAAS,OAAO,QAAQ;AACjC;AAGO,MAAM,iBAAiBX,MAAAA,KAAK,CAAC,QAAQ,IAAI,SAAS,GAAG,cAAc,CAAA,CAAE;AAErE,MAAM,gBAAgBA,MAAAA;AAAAA,EAC3B,CAAC,QAAQ;AACP,WAAO,IAAI,SAAS,GAAG,QAAQ,CAAA;AAAA,EACjC;AAAA,EACA,CAAC,KAAK,KAAK,YAAmB;AAC5B,QAAI,WAAW,CAAC,UAAoD;AAClE,UAAI,OAA4B,EAAE,GAAG,OAAO,MAAM,QAAA;AAClD,UACE,MAAM,KAAK,UAAU,KACrB,QAAQ,SAAS,KACjB,MAAM,WAAW,UAAU,GAC3B;AAEA,aAAK,aAAaU,WAAAA,mBAAmB,SAAS,MAAM,iBAAiB;AAAA,MACvE;AAQA,UAAI,CAAC,MAAM,mBAAmB;AAC5B,cAAM,QAAQ,uBAAuB,OAAO,OAAO;AACnD,aAAK,OAAO,MAAM;AAClB,aAAK,cAAc,MAAM;AACzB,aAAK,YAAY,MAAM;AACvB,aAAK,qBAAqB,MAAM;AAAA,MAClC;AAEA,aAAO;AAAA,IACT,CAAC;AAAA,EACH;AACF;AAMA,SAAS,gBACP,OACA,KACoC;AACpC,MAAI,OAAO,KAAM,QAAO;AACxB,QAAM,QAAQ,IAAIE,eAAS;AAC3B,MAAI,SAAS,KAAM,QAAO;AAC1B,SAAO,MAAM,SAAS,GAAG;AAC3B;AASA,SAAS,uBACP,OACA,SAMA;AACA,QAAM,EAAE,MAAM,SAAS,aAAa,cAAc;AAGlD,QAAM,OAAO,IAAI,IAAmC,MAAM,kBAAkB;AAC5E,QAAM,IAAI,KAAK;AAAA,IACb,QAAQ;AAAA,IACR,aAAa,UAAU;AAAA,IACvB,WAAW,UAAU;AAAA,EAAA;AAEvB,WAAS,IAAI,GAAG,IAAI,GAAG,KAAK;AAC1B,UAAM,MAAM,QAAQ,CAAC;AACrB,QAAI,OAAO,KAAM;AACjB,UAAM,KAAK,gBAAgB,OAAO,GAAG;AACrC,QAAI,MAAM,KAAM;AAChB,UAAM,OAAO,cAAc,CAAC;AAC5B,UAAM,SAAS,YAAY,CAAC;AAC5B,QAAI,QAAQ,QAAQ,UAAU,KAAM,MAAK,IAAI,IAAI,EAAE,MAAM,QAAQ;AAAA,EACnE;AAGA,QAAM,aAAa,QAAQ,MAAA;AAC3B,QAAM,cAAqB,CAAA;AAC3B,QAAM,aAAoB,CAAA;AAC1B,QAAM,+BAAe,IAAA;AACrB,WAAS,IAAI,GAAG,IAAI,WAAW,QAAQ,KAAK;AAC1C,UAAM,MAAM,WAAW,CAAC;AACxB,QAAI,OAAO,KAAM;AACjB,UAAM,KAAK,gBAAgB,OAAO,GAAG;AACrC,QAAI,MAAM,KAAM;AAChB,UAAM,QAAQ,KAAK,IAAI,EAAE;AACzB,QAAI,SAAS,KAAM;AACnB,QAAI,MAAM,QAAQ,KAAM,aAAY,CAAC,IAAI,MAAM;AAC/C,QAAI,MAAM,UAAU,KAAM,YAAW,CAAC,IAAI,MAAM;AAChD,aAAS,IAAI,EAAE;AAAA,EACjB;AAIA,QAAM,8BAAc,IAAA;AACpB,aAAW,CAAC,IAAI,KAAK,KAAK,MAAM;AAC9B,QAAI,SAAS,IAAI,EAAE,EAAG;AACtB,QAAI,MAAM,WAAWC,MAAAA,mBAAmB,OAAO;AAC7C,YAAM,MAAM,WAAW;AACvB,iBAAW,KAAK,MAAM,QAAQ,CAAA,CAAE;AAChC,kBAAY,GAAG,IAAI,MAAM;AACzB,iBAAW,GAAG,IAAI,MAAM;AAAA,IAC1B,OAAO;AACL,cAAQ,IAAI,IAAI,KAAK;AAAA,IACvB;AAAA,EACF;AAEA,SAAO;AAAA,IACL,MAAM;AAAA,IACN,aAAa;AAAA,IACb,WAAW;AAAA,IACX;AAAA,EAAA;AAEJ;;;;;;;;;;;"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { StoreApi } from 'zustand';
|
|
2
|
+
import { DataSheetProviderProps, DataSheetStore } from './types.ts';
|
|
3
|
+
import { TableAction } from './actions';
|
|
4
|
+
/** Create a Jotai scoped store */
|
|
5
|
+
export declare const ctx: import('@macrostrat/data-components').StateIsolation;
|
|
6
|
+
export declare const storeAPIAtom: import('jotai').PrimitiveAtom<StoreApi<DataSheetStore<any>> | undefined> & {
|
|
7
|
+
init: StoreApi<DataSheetStore<any>> | undefined;
|
|
8
|
+
};
|
|
9
|
+
/** This is the basis for all other atoms that manipulate the store. */
|
|
10
|
+
export declare const storeAtom: import('jotai').WritableAtom<DataSheetStore<any> | undefined, [action: any], void>;
|
|
11
|
+
export declare const tableActionsAtom: import('jotai').PrimitiveAtom<TableAction<any, null>[]> & {
|
|
12
|
+
init: TableAction<any, null>[];
|
|
13
|
+
};
|
|
14
|
+
export declare function DataSheetProvider<T>(props: DataSheetProviderProps<T>): import('react').FunctionComponentElement<{
|
|
15
|
+
children: import('react').ReactNode;
|
|
16
|
+
atoms?: import('@macrostrat/data-components').AtomMap;
|
|
17
|
+
keepUpdated?: boolean;
|
|
18
|
+
inherit?: boolean;
|
|
19
|
+
}>;
|
|
20
|
+
export declare function DataSheetProviderInner<T>({ children, data, columnSpec, columnSpecOptions, editable, enableColumnReordering, defaultColumnWidth, }: DataSheetProviderProps<T>): import('react').ReactNode;
|
|
21
|
+
export declare function useStoreAPI<T>(): StoreApi<DataSheetStore<T>>;
|
|
22
|
+
export declare function useSelector<T = any, A = any>(selector: (state: DataSheetStore<T> & DataSheetComputedVals) => A): A;
|
|
23
|
+
/** Atoms for efficient sub-selection of state */
|
|
24
|
+
export declare const columnSpecAtom: import('jotai').Atom<import('./utils').ColumnSpec[]>;
|
|
25
|
+
export declare const tableDataAtom: import('jotai').WritableAtom<any[], [newData: any[]], void>;
|
package/dist/provider.js
CHANGED
|
@@ -2,6 +2,7 @@ import { useState, useRef, useEffect } from "react";
|
|
|
2
2
|
import h from "@macrostrat/hyper";
|
|
3
3
|
import { createStore, useStore } from "zustand";
|
|
4
4
|
import { createScopedStore } from "@macrostrat/data-components";
|
|
5
|
+
import { TableElementStatus, DS_ROW_ID } from "./types.js";
|
|
5
6
|
import { createZustandStore } from "./zustand-store.js";
|
|
6
7
|
import { atomWithStore } from "jotai-zustand";
|
|
7
8
|
import { toasterAtom } from "./notifications.js";
|
|
@@ -101,22 +102,78 @@ const tableDataAtom = atom(
|
|
|
101
102
|
},
|
|
102
103
|
(get, set, newData) => {
|
|
103
104
|
set(storeAtom, (state) => {
|
|
104
|
-
|
|
105
|
+
let next = { ...state, data: newData };
|
|
105
106
|
if (state.data.length == 0 && newData.length > 0 && state.columnSpec.length == 0) {
|
|
106
|
-
|
|
107
|
-
return {
|
|
108
|
-
...state,
|
|
109
|
-
columnSpec: generateColumnSpec(newData, state.columnSpecOptions),
|
|
110
|
-
data: newData
|
|
111
|
-
};
|
|
107
|
+
next.columnSpec = generateColumnSpec(newData, state.columnSpecOptions);
|
|
112
108
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
data
|
|
116
|
-
|
|
109
|
+
if (!state.controlledOverlay) {
|
|
110
|
+
const remap = remapOverlayByIdentity(state, newData);
|
|
111
|
+
next.data = remap.data;
|
|
112
|
+
next.updatedData = remap.updatedData;
|
|
113
|
+
next.rowStatus = remap.rowStatus;
|
|
114
|
+
next.pendingOverlayById = remap.pending;
|
|
115
|
+
}
|
|
116
|
+
return next;
|
|
117
117
|
});
|
|
118
118
|
}
|
|
119
119
|
);
|
|
120
|
+
function overlayIdentity(state, row) {
|
|
121
|
+
if (row == null) return void 0;
|
|
122
|
+
const added = row[DS_ROW_ID];
|
|
123
|
+
if (added != null) return added;
|
|
124
|
+
return state.identity(row);
|
|
125
|
+
}
|
|
126
|
+
function remapOverlayByIdentity(state, newData) {
|
|
127
|
+
const { data: oldData, updatedData, rowStatus } = state;
|
|
128
|
+
const byId = new Map(state.pendingOverlayById);
|
|
129
|
+
const n = Math.max(
|
|
130
|
+
oldData.length,
|
|
131
|
+
updatedData?.length ?? 0,
|
|
132
|
+
rowStatus?.length ?? 0
|
|
133
|
+
);
|
|
134
|
+
for (let i = 0; i < n; i++) {
|
|
135
|
+
const row = oldData[i];
|
|
136
|
+
if (row == null) continue;
|
|
137
|
+
const id = overlayIdentity(state, row);
|
|
138
|
+
if (id == null) continue;
|
|
139
|
+
const edit = updatedData?.[i];
|
|
140
|
+
const status = rowStatus?.[i];
|
|
141
|
+
if (edit != null || status != null) byId.set(id, { edit, status });
|
|
142
|
+
}
|
|
143
|
+
const resultData = newData.slice();
|
|
144
|
+
const nextUpdated = [];
|
|
145
|
+
const nextStatus = [];
|
|
146
|
+
const attached = /* @__PURE__ */ new Set();
|
|
147
|
+
for (let j = 0; j < resultData.length; j++) {
|
|
148
|
+
const row = resultData[j];
|
|
149
|
+
if (row == null) continue;
|
|
150
|
+
const id = overlayIdentity(state, row);
|
|
151
|
+
if (id == null) continue;
|
|
152
|
+
const entry = byId.get(id);
|
|
153
|
+
if (entry == null) continue;
|
|
154
|
+
if (entry.edit != null) nextUpdated[j] = entry.edit;
|
|
155
|
+
if (entry.status != null) nextStatus[j] = entry.status;
|
|
156
|
+
attached.add(id);
|
|
157
|
+
}
|
|
158
|
+
const pending = /* @__PURE__ */ new Map();
|
|
159
|
+
for (const [id, entry] of byId) {
|
|
160
|
+
if (attached.has(id)) continue;
|
|
161
|
+
if (entry.status === TableElementStatus.ADDED) {
|
|
162
|
+
const idx = resultData.length;
|
|
163
|
+
resultData.push(entry.edit ?? {});
|
|
164
|
+
nextUpdated[idx] = entry.edit;
|
|
165
|
+
nextStatus[idx] = entry.status;
|
|
166
|
+
} else {
|
|
167
|
+
pending.set(id, entry);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
return {
|
|
171
|
+
data: resultData,
|
|
172
|
+
updatedData: nextUpdated,
|
|
173
|
+
rowStatus: nextStatus,
|
|
174
|
+
pending
|
|
175
|
+
};
|
|
176
|
+
}
|
|
120
177
|
export {
|
|
121
178
|
DataSheetProvider,
|
|
122
179
|
DataSheetProviderInner,
|
package/dist/provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sources":["../src/provider.ts"],"sourcesContent":["import { SetStateAction, useEffect, useRef, useState } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { createStore, StoreApi, useStore } from \"zustand\";\nimport type { Table } from \"@blueprintjs/table\";\nimport { generateColumnSpec } from \"./utils\";\nimport { createScopedStore } from \"@macrostrat/data-components\";\nimport {\n DataSheetProviderProps,\n DataSheetState,\n DataSheetStore,\n} from \"./types.ts\";\nimport { createZustandStore } from \"./zustand-store.ts\";\nimport { atomWithStore } from \"jotai-zustand\";\nimport { toasterAtom } from \"./notifications.ts\";\nimport { TableAction } from \"./actions\";\nimport { atom } from \"jotai\";\n\n/** Create a Jotai scoped store */\nexport const ctx = createScopedStore();\n\nexport const storeAPIAtom = atom<StoreApi<DataSheetStore<any>>>();\n\nconst storeWrapperAtom = atom((get) => {\n const _storeAPIAtom = get(storeAPIAtom);\n if (_storeAPIAtom == null) {\n return undefined;\n }\n return atomWithStore(_storeAPIAtom);\n});\n\n/** This is the basis for all other atoms that manipulate the store. */\nexport const storeAtom = atom(\n (get) => {\n const storeWrapper = get(storeWrapperAtom);\n if (storeWrapper == null) {\n return undefined;\n }\n return get(storeWrapper);\n },\n (get, set, action: SetStateAction<T>) => {\n const storeWrapper = get(storeWrapperAtom);\n if (storeWrapper == null) {\n throw new Error(\"Missing DataSheetProvider\");\n }\n return set(storeWrapper, action);\n },\n);\n\nconst initializeStoreAtom = atom(\n null,\n (get, set, payload: Partial<DataSheetStore<T>>) => {\n set(storeAtom, (state) => {\n return {\n ...state,\n ...payload,\n };\n });\n },\n);\n\nexport const tableActionsAtom = atom<TableAction[]>([]);\n\nexport function DataSheetProvider<T>(props: DataSheetProviderProps<T>) {\n const { toaster, ...rest } = props;\n const [store] = useState(() => {\n return createStore<DataSheetStore<T>>(createZustandStore);\n });\n return h(\n ctx.Provider,\n {\n atoms: [\n [storeAPIAtom, store],\n [toasterAtom, toaster],\n ],\n },\n h(DataSheetProviderInner, rest),\n );\n}\n\nexport function DataSheetProviderInner<T>({\n children,\n data,\n columnSpec,\n columnSpecOptions,\n editable,\n enableColumnReordering,\n defaultColumnWidth = 150,\n}: DataSheetProviderProps<T>) {\n const tableRef = useRef<Table>(null);\n\n const initializeStore = ctx.useSet(initializeStoreAtom);\n\n // Not sure how required this initialization is\n useEffect(() => {\n initializeStore({\n columnSpec: columnSpec ?? generateColumnSpec(data, columnSpecOptions),\n editable,\n enableColumnReordering,\n data,\n defaultColumnWidth,\n tableRef,\n });\n }, [data, editable, columnSpec, columnSpecOptions, enableColumnReordering]);\n\n return children;\n}\n\nexport function useStoreAPI<T>(): StoreApi<DataSheetStore<T>> {\n const store = ctx.useValue(storeAPIAtom);\n if (!store) {\n throw new Error(\"Missing DataSheetProvider\");\n }\n return store;\n}\n\nexport function useSelector<T = any, A = any>(\n selector: (state: DataSheetStore<T> & DataSheetComputedVals) => A,\n): A {\n const store = useStoreAPI<T>();\n return useStore(store, selector);\n}\n/** Atoms for efficient sub-selection of state */\n\nexport const columnSpecAtom = atom((get) => get(storeAtom)?.columnSpec ?? []);\n\nexport const tableDataAtom = atom(\n (get) => {\n return get(storeAtom)?.data ?? [];\n },\n (get, set, newData: any[]) => {\n set(storeAtom, (state: DataSheetState<any>): DataSheetState<any> => {\n console.log(\"Updating table data\", newData);\n if (\n state.data.length == 0 &&\n newData.length > 0 &&\n state.columnSpec.length == 0\n ) {\n console.log(\"Generating column spec from data\");\n /** We haven't yet generated the column spec, and we need to do so. TODO: we may be able to forestall this with loading state */\n return {\n ...state,\n columnSpec: generateColumnSpec(newData, state.columnSpecOptions),\n data: newData,\n };\n }\n\n return {\n ...state,\n data: newData,\n };\n });\n },\n);\n"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"provider.js","sources":["../src/provider.ts"],"sourcesContent":["import { SetStateAction, useEffect, useRef, useState } from \"react\";\nimport h from \"@macrostrat/hyper\";\nimport { createStore, StoreApi, useStore } from \"zustand\";\nimport type { Table } from \"@blueprintjs/table\";\nimport { generateColumnSpec } from \"./utils\";\nimport { createScopedStore } from \"@macrostrat/data-components\";\nimport {\n DataSheetProviderProps,\n DataSheetState,\n DataSheetStore,\n DS_ROW_ID,\n TableElementStatus,\n} from \"./types.ts\";\nimport { createZustandStore } from \"./zustand-store.ts\";\nimport { atomWithStore } from \"jotai-zustand\";\nimport { toasterAtom } from \"./notifications.ts\";\nimport { TableAction } from \"./actions\";\nimport { atom } from \"jotai\";\n\n/** Create a Jotai scoped store */\nexport const ctx = createScopedStore();\n\nexport const storeAPIAtom = atom<StoreApi<DataSheetStore<any>>>();\n\nconst storeWrapperAtom = atom((get) => {\n const _storeAPIAtom = get(storeAPIAtom);\n if (_storeAPIAtom == null) {\n return undefined;\n }\n return atomWithStore(_storeAPIAtom);\n});\n\n/** This is the basis for all other atoms that manipulate the store. */\nexport const storeAtom = atom(\n (get) => {\n const storeWrapper = get(storeWrapperAtom);\n if (storeWrapper == null) {\n return undefined;\n }\n return get(storeWrapper);\n },\n (get, set, action: SetStateAction<T>) => {\n const storeWrapper = get(storeWrapperAtom);\n if (storeWrapper == null) {\n throw new Error(\"Missing DataSheetProvider\");\n }\n return set(storeWrapper, action);\n },\n);\n\nconst initializeStoreAtom = atom(\n null,\n (get, set, payload: Partial<DataSheetStore<T>>) => {\n set(storeAtom, (state) => {\n return {\n ...state,\n ...payload,\n };\n });\n },\n);\n\nexport const tableActionsAtom = atom<TableAction[]>([]);\n\nexport function DataSheetProvider<T>(props: DataSheetProviderProps<T>) {\n const { toaster, ...rest } = props;\n const [store] = useState(() => {\n return createStore<DataSheetStore<T>>(createZustandStore);\n });\n return h(\n ctx.Provider,\n {\n atoms: [\n [storeAPIAtom, store],\n [toasterAtom, toaster],\n ],\n },\n h(DataSheetProviderInner, rest),\n );\n}\n\nexport function DataSheetProviderInner<T>({\n children,\n data,\n columnSpec,\n columnSpecOptions,\n editable,\n enableColumnReordering,\n defaultColumnWidth = 150,\n}: DataSheetProviderProps<T>) {\n const tableRef = useRef<Table>(null);\n\n const initializeStore = ctx.useSet(initializeStoreAtom);\n\n // Not sure how required this initialization is\n useEffect(() => {\n initializeStore({\n columnSpec: columnSpec ?? generateColumnSpec(data, columnSpecOptions),\n editable,\n enableColumnReordering,\n data,\n defaultColumnWidth,\n tableRef,\n });\n }, [data, editable, columnSpec, columnSpecOptions, enableColumnReordering]);\n\n return children;\n}\n\nexport function useStoreAPI<T>(): StoreApi<DataSheetStore<T>> {\n const store = ctx.useValue(storeAPIAtom);\n if (!store) {\n throw new Error(\"Missing DataSheetProvider\");\n }\n return store;\n}\n\nexport function useSelector<T = any, A = any>(\n selector: (state: DataSheetStore<T> & DataSheetComputedVals) => A,\n): A {\n const store = useStoreAPI<T>();\n return useStore(store, selector);\n}\n/** Atoms for efficient sub-selection of state */\n\nexport const columnSpecAtom = atom((get) => get(storeAtom)?.columnSpec ?? []);\n\nexport const tableDataAtom = atom(\n (get) => {\n return get(storeAtom)?.data ?? [];\n },\n (get, set, newData: any[]) => {\n set(storeAtom, (state: DataSheetState<any>): DataSheetState<any> => {\n let next: DataSheetState<any> = { ...state, data: newData };\n if (\n state.data.length == 0 &&\n newData.length > 0 &&\n state.columnSpec.length == 0\n ) {\n // We haven't yet generated the column spec, and we need to do so.\n next.columnSpec = generateColumnSpec(newData, state.columnSpecOptions);\n }\n\n // Re-attach the edit overlay by identity. The loader replaces `data` with\n // re-ordered windows on sort/filter, so an index-keyed overlay would\n // smear; keying by identity keeps edits (and deletes) on their rows, holds\n // edits for not-yet-loaded rows, and re-appends locally-added rows (which\n // aren't in the provider's data) after it. Skipped when the consumer\n // controls the overlay (they own reconciliation).\n if (!state.controlledOverlay) {\n const remap = remapOverlayByIdentity(state, newData);\n next.data = remap.data;\n next.updatedData = remap.updatedData;\n next.rowStatus = remap.rowStatus;\n next.pendingOverlayById = remap.pending;\n }\n\n return next;\n });\n },\n);\n\ntype OverlayEntry = { edit?: any; status?: any };\n\n/** Row identity used by the overlay: an in-table-added row's synthetic id\n * (stable across its edits), else the provider/consumer `identity`. */\nfunction overlayIdentity(\n state: DataSheetState<any>,\n row: any,\n): string | number | null | undefined {\n if (row == null) return undefined;\n const added = row[DS_ROW_ID];\n if (added != null) return added;\n return state.identity(row);\n}\n\n/** Re-project the (index-keyed) edit overlay from the old `data` order onto a\n * new one, matching rows by identity. Edits/statuses whose row is absent from\n * `newData` are held in `pending` and re-applied when the row loads; rows added\n * in-table (status `ADDED`) are re-appended after the provider data (they have\n * no provider row). Starts from the prior pending set so edits survive multiple\n * re-sorts. Returns the reconstructed data (provider rows + re-appended added\n * rows) alongside the re-aligned overlay. */\nfunction remapOverlayByIdentity(\n state: DataSheetState<any>,\n newData: any[],\n): {\n data: any[];\n updatedData: any[];\n rowStatus: any[];\n pending: Map<string | number, OverlayEntry>;\n} {\n const { data: oldData, updatedData, rowStatus } = state;\n\n // Collect current overlay entries by identity, seeded with prior pending.\n const byId = new Map<string | number, OverlayEntry>(state.pendingOverlayById);\n const n = Math.max(\n oldData.length,\n updatedData?.length ?? 0,\n rowStatus?.length ?? 0,\n );\n for (let i = 0; i < n; i++) {\n const row = oldData[i];\n if (row == null) continue;\n const id = overlayIdentity(state, row);\n if (id == null) continue;\n const edit = updatedData?.[i];\n const status = rowStatus?.[i];\n if (edit != null || status != null) byId.set(id, { edit, status });\n }\n\n // Project onto the new data order.\n const resultData = newData.slice();\n const nextUpdated: any[] = [];\n const nextStatus: any[] = [];\n const attached = new Set<string | number>();\n for (let j = 0; j < resultData.length; j++) {\n const row = resultData[j];\n if (row == null) continue;\n const id = overlayIdentity(state, row);\n if (id == null) continue;\n const entry = byId.get(id);\n if (entry == null) continue;\n if (entry.edit != null) nextUpdated[j] = entry.edit;\n if (entry.status != null) nextStatus[j] = entry.status;\n attached.add(id);\n }\n\n // Re-append in-table-added rows (not present in the provider data), then hold\n // anything still unattached (rows not currently loaded) as pending.\n const pending = new Map<string | number, OverlayEntry>();\n for (const [id, entry] of byId) {\n if (attached.has(id)) continue;\n if (entry.status === TableElementStatus.ADDED) {\n const idx = resultData.length;\n resultData.push(entry.edit ?? {});\n nextUpdated[idx] = entry.edit;\n nextStatus[idx] = entry.status;\n } else {\n pending.set(id, entry);\n }\n }\n\n return {\n data: resultData,\n updatedData: nextUpdated,\n rowStatus: nextStatus,\n pending,\n };\n}\n"],"names":[],"mappings":"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"}
|
|
@@ -3,101 +3,121 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
|
3
3
|
const h = require("@macrostrat/hyper");
|
|
4
4
|
const table = require("@blueprintjs/table");
|
|
5
5
|
const core = require("@blueprintjs/core");
|
|
6
|
-
require("react");
|
|
7
6
|
const provider = require("../provider.cjs");
|
|
7
|
+
const selection = require("../actions/selection.cjs");
|
|
8
8
|
const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
|
|
9
9
|
const h__default = /* @__PURE__ */ _interopDefault(h);
|
|
10
|
-
function autoFilterId(key) {
|
|
11
|
-
return `__col_${key}`;
|
|
12
|
-
}
|
|
13
10
|
function renderColumnHeaderCell({
|
|
14
11
|
col,
|
|
15
12
|
colIndex,
|
|
16
13
|
activeSort,
|
|
17
14
|
activeFilter
|
|
18
15
|
}) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const storeAPI = provider.useStoreAPI();
|
|
25
|
-
const columnFilterEntries = [];
|
|
26
|
-
for (const [id, entry] of activeFilters) {
|
|
27
|
-
if (id.startsWith("__col_") && entry.state?.search) {
|
|
28
|
-
columnFilterEntries.push({
|
|
29
|
-
key: id.replace("__col_", ""),
|
|
30
|
-
search: entry.state.search
|
|
31
|
-
});
|
|
32
|
-
}
|
|
16
|
+
const isSortable = col.sortable === true;
|
|
17
|
+
const isFilterable = col.filterable === true || typeof col.filterable === "object" || Array.isArray(col.filters) && col.filters.length > 0;
|
|
18
|
+
const hasCustomActions = Array.isArray(col.actions) && col.actions.length > 0;
|
|
19
|
+
if (!isSortable && !isFilterable && !hasCustomActions) {
|
|
20
|
+
return h__default.default(table.ColumnHeaderCell, { name: col.name });
|
|
33
21
|
}
|
|
34
|
-
const
|
|
35
|
-
|
|
22
|
+
const hasFilterActive = activeFilter != null;
|
|
23
|
+
const hasSortActive = activeSort != null;
|
|
24
|
+
return h__default.default(table.ColumnHeaderCell, {
|
|
25
|
+
name: col.name,
|
|
26
|
+
// Persistent interaction bar so the menu caret is always clickable — the
|
|
27
|
+
// hover-triggered caret was blocked by the selection overlay when the
|
|
28
|
+
// column was selected.
|
|
29
|
+
enableColumnInteractionBar: true,
|
|
30
|
+
nameRenderer: () => h__default.default(ColumnHeaderName, { col, hasSortActive, hasFilterActive, activeSort }),
|
|
31
|
+
menuRenderer: () => h__default.default(ColumnHeaderControls, { colIndex })
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
function ColumnHeaderName({ col, hasSortActive, hasFilterActive, activeSort }) {
|
|
36
35
|
return h__default.default(
|
|
37
36
|
"div",
|
|
38
|
-
{
|
|
39
|
-
style: {
|
|
40
|
-
display: "flex",
|
|
41
|
-
flexDirection: "row",
|
|
42
|
-
flexWrap: "wrap",
|
|
43
|
-
gap: "4px",
|
|
44
|
-
marginBottom: "4px",
|
|
45
|
-
alignItems: "center"
|
|
46
|
-
}
|
|
47
|
-
},
|
|
37
|
+
{ style: { display: "flex", alignItems: "center", width: "100%" } },
|
|
48
38
|
[
|
|
49
|
-
columnSorts.map(
|
|
50
|
-
(s) => h__default.default(
|
|
51
|
-
core.Tag,
|
|
52
|
-
{
|
|
53
|
-
key: `sort-${s.key}`,
|
|
54
|
-
icon: s.ascending ? "sort-asc" : "sort-desc",
|
|
55
|
-
intent: "primary",
|
|
56
|
-
onRemove() {
|
|
57
|
-
storeAPI.getState().setColumnSort(s.key, null);
|
|
58
|
-
},
|
|
59
|
-
minimal: true
|
|
60
|
-
},
|
|
61
|
-
`${s.key}: ${s.ascending ? "A→Z" : "Z→A"}`
|
|
62
|
-
)
|
|
63
|
-
),
|
|
64
|
-
columnFilterEntries.map(
|
|
65
|
-
(f) => h__default.default(
|
|
66
|
-
core.Tag,
|
|
67
|
-
{
|
|
68
|
-
key: `filter-${f.key}`,
|
|
69
|
-
icon: "filter",
|
|
70
|
-
intent: "warning",
|
|
71
|
-
onRemove() {
|
|
72
|
-
storeAPI.getState().removeFilter(autoFilterId(f.key));
|
|
73
|
-
},
|
|
74
|
-
minimal: true
|
|
75
|
-
},
|
|
76
|
-
`${f.key} contains "${f.search}"`
|
|
77
|
-
)
|
|
78
|
-
),
|
|
79
39
|
h__default.default(
|
|
80
|
-
|
|
40
|
+
"span",
|
|
41
|
+
{
|
|
42
|
+
style: {
|
|
43
|
+
flex: 1,
|
|
44
|
+
overflow: "hidden",
|
|
45
|
+
textOverflow: "ellipsis",
|
|
46
|
+
whiteSpace: "nowrap"
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
col.name
|
|
50
|
+
),
|
|
51
|
+
h__default.default.if(hasSortActive || hasFilterActive)(
|
|
52
|
+
"span",
|
|
81
53
|
{
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
for (const [id] of activeFilters) {
|
|
89
|
-
if (id.startsWith("__col_")) {
|
|
90
|
-
store.removeFilter(id);
|
|
91
|
-
}
|
|
92
|
-
}
|
|
54
|
+
style: {
|
|
55
|
+
display: "flex",
|
|
56
|
+
alignItems: "center",
|
|
57
|
+
gap: "2px",
|
|
58
|
+
marginLeft: "4px",
|
|
59
|
+
flexShrink: 0
|
|
93
60
|
}
|
|
94
61
|
},
|
|
95
|
-
|
|
62
|
+
[
|
|
63
|
+
h__default.default.if(hasSortActive)(core.Icon, {
|
|
64
|
+
icon: activeSort?.ascending ? "sort-asc" : "sort-desc",
|
|
65
|
+
size: 12,
|
|
66
|
+
style: { color: "var(--intent-primary, #2965cc)" }
|
|
67
|
+
}),
|
|
68
|
+
h__default.default.if(hasFilterActive)(core.Icon, {
|
|
69
|
+
icon: "filter",
|
|
70
|
+
size: 12,
|
|
71
|
+
style: { color: "var(--intent-warning, #d99e0b)" }
|
|
72
|
+
})
|
|
73
|
+
]
|
|
96
74
|
)
|
|
97
75
|
]
|
|
98
76
|
);
|
|
99
77
|
}
|
|
100
|
-
|
|
101
|
-
|
|
78
|
+
function ColumnHeaderControls({ colIndex }) {
|
|
79
|
+
const storeAPI = provider.useStoreAPI();
|
|
80
|
+
const actions = provider.ctx.useValue(provider.tableActionsAtom);
|
|
81
|
+
const actionCtx = selection.buildActionContext(
|
|
82
|
+
{
|
|
83
|
+
...storeAPI.getState(),
|
|
84
|
+
selection: [{ cols: [colIndex, colIndex], rows: void 0 }]
|
|
85
|
+
},
|
|
86
|
+
storeAPI.setState
|
|
87
|
+
);
|
|
88
|
+
const controls = actions.filter(
|
|
89
|
+
(a) => a.targets.includes(table.RegionCardinality.FULL_COLUMNS) && (a.appliesTo?.(actionCtx) ?? true)
|
|
90
|
+
);
|
|
91
|
+
const rendered = controls.map(
|
|
92
|
+
(a) => a.render != null ? a.render(actionCtx) : h__default.default(
|
|
93
|
+
core.Button,
|
|
94
|
+
{
|
|
95
|
+
key: a.id,
|
|
96
|
+
small: true,
|
|
97
|
+
minimal: true,
|
|
98
|
+
icon: a.icon,
|
|
99
|
+
intent: a.intent,
|
|
100
|
+
onClick: () => a.run?.(actionCtx)
|
|
101
|
+
},
|
|
102
|
+
a.name
|
|
103
|
+
)
|
|
104
|
+
).filter(Boolean);
|
|
105
|
+
if (rendered.length === 0) {
|
|
106
|
+
return h__default.default(core.Menu, [h__default.default(core.MenuItem, { text: "No options", disabled: true })]);
|
|
107
|
+
}
|
|
108
|
+
return h__default.default(
|
|
109
|
+
"div.column-header-controls",
|
|
110
|
+
{
|
|
111
|
+
style: {
|
|
112
|
+
padding: "8px",
|
|
113
|
+
display: "flex",
|
|
114
|
+
flexDirection: "column",
|
|
115
|
+
gap: "6px",
|
|
116
|
+
alignItems: "flex-start"
|
|
117
|
+
}
|
|
118
|
+
},
|
|
119
|
+
rendered
|
|
120
|
+
);
|
|
121
|
+
}
|
|
102
122
|
exports.renderColumnHeaderCell = renderColumnHeaderCell;
|
|
103
123
|
//# sourceMappingURL=column-header-cell.cjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"column-header-cell.cjs","sources":["../../src/renderers/column-header-cell.ts"],"sourcesContent":["/**\n * Column header with client-side sort and filter controls.\n *\n * Mirrors the PostgREST column header UX but operates on in-memory data.\n * Sort state is stored in the DataSheet zustand store; filtering uses the\n * existing `setFilter` / `removeFilter` mechanism with auto-generated\n * predicate filters for simple text search.\n */\nimport h from \"@macrostrat/hyper\";\nimport { ColumnHeaderCell } from \"@blueprintjs/table\";\nimport {\n Button,\n ButtonGroup,\n Icon,\n InputGroup,\n Menu,\n Tag as BPTag,\n} from \"@blueprintjs/core\";\nimport { useCallback, useRef } from \"react\";\nimport { useSelector, useStoreAPI } from \"../provider\";\nimport type { ColumnSpec } from \"../utils/column-spec\";\nimport type { ColumnSort, TableFilter } from \"../actions/types\";\nimport type {\n PostgrestColumnFilter,\n ColumnSortEntry,\n} from \"../postgrest-table\";\n\nexport interface ColumnActionsConfig {\n activeSort?: ColumnSortEntry | null;\n activeFilter?: PostgrestColumnFilter | null;\n}\n\nexport interface ColumnHeaderRendererProps extends ColumnActionsConfig {\n col: ColumnSpec;\n colIndex: number;\n //actions: ColumnHeaderActions;\n}\n\n// ---- Auto-generated column filter helpers ----\n\n/** Build a simple text-contains filter for a column. */\nfunction buildAutoFilter(col: ColumnSpec): TableFilter {\n return {\n id: autoFilterId(col.key),\n name: col.name,\n columnKey: col.key,\n icon: \"filter\",\n defaultState: { search: \"\" },\n predicate(row, state) {\n if (!state?.search) return true;\n const val = String(row[col.key] ?? \"\").toLowerCase();\n return val.includes(state.search.toLowerCase());\n },\n };\n}\n\n/** Stable filter-ID prefix for auto-generated column filters. */\nexport function autoFilterId(key: string) {\n return `__col_${key}`;\n}\n\n// ---- Column header cell ----\n\n/** Client-side column header cell with sort/filter controls.\n * Reads sort state from the store and manages column filters via\n * the existing `setFilter`/`removeFilter` store methods. */\nexport function renderColumnHeaderCell({\n col,\n colIndex,\n activeSort,\n activeFilter,\n}: ColumnHeaderRendererProps) {\n return h(ColumnHeaderCell, { name: col.name });\n\n const isSortable = col.sortable === true;\n const isFilterable =\n col.filterable === true || typeof col.filterable === \"object\";\n\n if (!isSortable && !isFilterable) {\n return h(ColumnHeaderCell, { name: col.name });\n }\n\n const hasFilterActive =\n activeFilter != null &&\n activeFilter.state?.search !== \"\" &&\n activeFilter.state?.search != null;\n\n const hasSortActive = activeSort != null;\n\n return h(ColumnHeaderCell, {\n name: col.name,\n nameRenderer: () =>\n h(ColumnHeaderName, { col, hasSortActive, hasFilterActive, activeSort }),\n menuRenderer: () =>\n h(ClientColumnActionsMenu, {\n col,\n isSortable,\n isFilterable,\n activeSort,\n activeFilter,\n }),\n });\n}\n\n/** Column name with active sort/filter indicator icons. */\nfunction ColumnHeaderName({ col, hasSortActive, hasFilterActive, activeSort }) {\n return h(\n \"div\",\n { style: { display: \"flex\", alignItems: \"center\", width: \"100%\" } },\n [\n h(\n \"span\",\n {\n style: {\n flex: 1,\n overflow: \"hidden\",\n textOverflow: \"ellipsis\",\n whiteSpace: \"nowrap\",\n },\n },\n col.name,\n ),\n h.if(hasSortActive || hasFilterActive)(\n \"span\",\n {\n style: {\n display: \"flex\",\n alignItems: \"center\",\n gap: \"2px\",\n marginLeft: \"4px\",\n flexShrink: 0,\n },\n },\n [\n h.if(hasSortActive)(Icon, {\n icon: activeSort?.ascending ? \"sort-asc\" : \"sort-desc\",\n size: 12,\n style: { color: \"var(--intent-primary, #2965cc)\" },\n }),\n h.if(hasFilterActive)(Icon, {\n icon: \"filter\",\n size: 12,\n style: { color: \"var(--intent-warning, #d99e0b)\" },\n }),\n ],\n ),\n ],\n );\n}\n\ninterface ClientColumnActionsMenuProps extends ColumnActionsConfig {\n col: ColumnSpec;\n isSortable: boolean;\n isFilterable: boolean;\n}\n\n/** Menu content rendered inside ColumnHeaderCell's built-in dropdown. */\nfunction ClientColumnActionsMenu({\n col,\n isSortable,\n isFilterable,\n activeSort,\n activeFilter,\n}) {\n const storeAPI = useStoreAPI();\n const filterInputRef = useRef<HTMLInputElement>(null);\n\n const applyFilter = useCallback(() => {\n const val = filterInputRef.current?.value ?? \"\";\n const store = storeAPI.getState();\n if (val.trim() === \"\") {\n store.removeFilter(autoFilterId(col.key));\n } else {\n const filter = buildAutoFilter(col);\n store.setFilter(filter.id, filter, { search: val });\n }\n }, [col, storeAPI]);\n\n const hasAnyActive =\n activeSort != null ||\n (activeFilter != null &&\n activeFilter.state?.search !== \"\" &&\n activeFilter.state?.search != null);\n\n return h(Menu, { className: \"column-actions-menu\" }, [\n h(\"div\", { style: { padding: \"12px\", minWidth: \"220px\" } }, [\n h.if(isSortable)(\"div\", { style: { marginBottom: \"12px\" } }, [\n h(\"div\", { style: sortFilterLabelStyle }, \"Sort\"),\n h(\"div\", { style: { display: \"flex\", gap: \"4px\" } }, [\n h(ButtonGroup, { minimal: true }, [\n h(\n Button,\n {\n icon: \"sort-asc\",\n active: activeSort?.ascending === true,\n intent: activeSort?.ascending === true ? \"primary\" : \"none\",\n onClick() {\n const store = storeAPI.getState();\n if (activeSort?.ascending === true) {\n store.setColumnSort(col.key, null);\n } else {\n store.setColumnSort(col.key, true);\n }\n },\n },\n \"A→Z\",\n ),\n h(\n Button,\n {\n icon: \"sort-desc\",\n active: activeSort?.ascending === false,\n intent: activeSort?.ascending === false ? \"primary\" : \"none\",\n onClick() {\n const store = storeAPI.getState();\n if (activeSort?.ascending === false) {\n store.setColumnSort(col.key, null);\n } else {\n store.setColumnSort(col.key, false);\n }\n },\n },\n \"Z→A\",\n ),\n ]),\n ]),\n ]),\n h.if(isFilterable)(\"div\", { style: { marginBottom: \"12px\" } }, [\n h(\"div\", { style: sortFilterLabelStyle }, \"Filter\"),\n h(\n \"div\",\n { style: { display: \"flex\", gap: \"4px\", alignItems: \"center\" } },\n [\n h(InputGroup, {\n className: \"filter-value-input\",\n small: true,\n placeholder: \"Search…\",\n defaultValue: activeFilterEntry?.state?.search ?? \"\",\n inputRef: filterInputRef,\n onKeyDown(e) {\n if (e.key === \"Enter\") {\n applyFilter();\n }\n },\n rightElement: h(Button, {\n icon: \"arrow-right\",\n minimal: true,\n small: true,\n onClick: applyFilter,\n }),\n }),\n ],\n ),\n ]),\n h.if(hasAnyActive)(\n \"div\",\n {\n style: {\n display: \"flex\",\n justifyContent: \"flex-end\",\n paddingTop: \"4px\",\n borderTop: \"1px solid var(--divider-color, rgba(16, 22, 26, 0.15))\",\n },\n },\n [\n h(\n Button,\n {\n small: true,\n minimal: true,\n intent: \"danger\",\n icon: \"cross\",\n onClick() {\n const store = storeAPI.getState();\n store.setColumnSort(col.key, null);\n store.removeFilter(autoFilterId(col.key));\n if (filterInputRef.current) {\n filterInputRef.current.value = \"\";\n }\n },\n },\n \"Clear all\",\n ),\n ],\n ),\n ]),\n ]);\n}\n\nconst sortFilterLabelStyle = {\n fontWeight: 600,\n fontSize: \"11px\",\n textTransform: \"uppercase\" as const,\n letterSpacing: \"0.5px\",\n color: \"var(--secondary-color, #5c7080)\",\n marginBottom: \"6px\",\n};\n\n// ---- Sort/filter state bar ----\n\n/** Bar showing active client-side sort and filter state as removable tags.\n * Rendered automatically by `_DataSheet` when sorts or column filters\n * are active. */\nexport function SortFilterBar() {\n const columnSorts = useSelector((state) => state.columnSorts);\n const activeFilters = useSelector((state) => state.activeFilters);\n const storeAPI = useStoreAPI();\n\n // Collect auto-generated column filters\n const columnFilterEntries: { key: string; search: string }[] = [];\n for (const [id, entry] of activeFilters) {\n if (id.startsWith(\"__col_\") && entry.state?.search) {\n columnFilterEntries.push({\n key: id.replace(\"__col_\", \"\"),\n search: entry.state.search,\n });\n }\n }\n\n const hasAnything = columnSorts.length > 0 || columnFilterEntries.length > 0;\n if (!hasAnything) return null;\n\n return h(\n \"div\",\n {\n style: {\n display: \"flex\",\n flexDirection: \"row\",\n flexWrap: \"wrap\",\n gap: \"4px\",\n marginBottom: \"4px\",\n alignItems: \"center\",\n },\n },\n [\n columnSorts.map((s) =>\n h(\n BPTag,\n {\n key: `sort-${s.key}`,\n icon: s.ascending ? \"sort-asc\" : \"sort-desc\",\n intent: \"primary\",\n onRemove() {\n storeAPI.getState().setColumnSort(s.key, null);\n },\n minimal: true,\n },\n `${s.key}: ${s.ascending ? \"A→Z\" : \"Z→A\"}`,\n ),\n ),\n columnFilterEntries.map((f) =>\n h(\n BPTag,\n {\n key: `filter-${f.key}`,\n icon: \"filter\",\n intent: \"warning\",\n onRemove() {\n storeAPI.getState().removeFilter(autoFilterId(f.key));\n },\n minimal: true,\n },\n `${f.key} contains \"${f.search}\"`,\n ),\n ),\n h(\n Button,\n {\n minimal: true,\n small: true,\n icon: \"cross\",\n onClick() {\n const store = storeAPI.getState();\n // Clear all column sorts\n store.clearColumnSorts();\n // Clear auto-generated column filters\n for (const [id] of activeFilters) {\n if (id.startsWith(\"__col_\")) {\n store.removeFilter(id);\n }\n }\n },\n },\n \"Clear all\",\n ),\n ],\n );\n}\n"],"names":["h","ColumnHeaderCell","useSelector","useStoreAPI","BPTag","Button"],"mappings":";;;;;;;;;AAyDO,SAAS,aAAa,KAAa;AACxC,SAAO,SAAS,GAAG;AACrB;AAOO,SAAS,uBAAuB;AAAA,EACrC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA8B;AAC5B,SAAOA,WAAAA,QAAEC,MAAAA,kBAAkB,EAAE,MAAM,IAAI,MAAM;AA8B/C;AAyMO,SAAS,gBAAgB;AAC9B,QAAM,cAAcC,SAAAA,YAAY,CAAC,UAAU,MAAM,WAAW;AAC5D,QAAM,gBAAgBA,SAAAA,YAAY,CAAC,UAAU,MAAM,aAAa;AAChE,QAAM,WAAWC,SAAAA,YAAA;AAGjB,QAAM,sBAAyD,CAAA;AAC/D,aAAW,CAAC,IAAI,KAAK,KAAK,eAAe;AACvC,QAAI,GAAG,WAAW,QAAQ,KAAK,MAAM,OAAO,QAAQ;AAClD,0BAAoB,KAAK;AAAA,QACvB,KAAK,GAAG,QAAQ,UAAU,EAAE;AAAA,QAC5B,QAAQ,MAAM,MAAM;AAAA,MAAA,CACrB;AAAA,IACH;AAAA,EACF;AAEA,QAAM,cAAc,YAAY,SAAS,KAAK,oBAAoB,SAAS;AAC3E,MAAI,CAAC,YAAa,QAAO;AAEzB,SAAOH,WAAAA;AAAAA,IACL;AAAA,IACA;AAAA,MACE,OAAO;AAAA,QACL,SAAS;AAAA,QACT,eAAe;AAAA,QACf,UAAU;AAAA,QACV,KAAK;AAAA,QACL,cAAc;AAAA,QACd,YAAY;AAAA,MAAA;AAAA,IACd;AAAA,IAEF;AAAA,MACE,YAAY;AAAA,QAAI,CAAC,MACfA,WAAAA;AAAAA,UACEI,KAAAA;AAAAA,UACA;AAAA,YACE,KAAK,QAAQ,EAAE,GAAG;AAAA,YAClB,MAAM,EAAE,YAAY,aAAa;AAAA,YACjC,QAAQ;AAAA,YACR,WAAW;AACT,uBAAS,SAAA,EAAW,cAAc,EAAE,KAAK,IAAI;AAAA,YAC/C;AAAA,YACA,SAAS;AAAA,UAAA;AAAA,UAEX,GAAG,EAAE,GAAG,KAAK,EAAE,YAAY,QAAQ,KAAK;AAAA,QAAA;AAAA,MAC1C;AAAA,MAEF,oBAAoB;AAAA,QAAI,CAAC,MACvBJ,WAAAA;AAAAA,UACEI,KAAAA;AAAAA,UACA;AAAA,YACE,KAAK,UAAU,EAAE,GAAG;AAAA,YACpB,MAAM;AAAA,YACN,QAAQ;AAAA,YACR,WAAW;AACT,uBAAS,WAAW,aAAa,aAAa,EAAE,GAAG,CAAC;AAAA,YACtD;AAAA,YACA,SAAS;AAAA,UAAA;AAAA,UAEX,GAAG,EAAE,GAAG,cAAc,EAAE,MAAM;AAAA,QAAA;AAAA,MAChC;AAAA,MAEFJ,WAAAA;AAAAA,QACEK,KAAAA;AAAAA,QACA;AAAA,UACE,SAAS;AAAA,UACT,OAAO;AAAA,UACP,MAAM;AAAA,UACN,UAAU;AACR,kBAAM,QAAQ,SAAS,SAAA;AAEvB,kBAAM,iBAAA;AAEN,uBAAW,CAAC,EAAE,KAAK,eAAe;AAChC,kBAAI,GAAG,WAAW,QAAQ,GAAG;AAC3B,sBAAM,aAAa,EAAE;AAAA,cACvB;AAAA,YACF;AAAA,UACF;AAAA,QAAA;AAAA,QAEF;AAAA,MAAA;AAAA,IACF;AAAA,EACF;AAEJ;;;;"}
|
|
1
|
+
{"version":3,"file":"column-header-cell.cjs","sources":["../../src/renderers/column-header-cell.ts"],"sourcesContent":["/**\n * Column header with client-side sort and filter controls.\n *\n * Mirrors the PostgREST column header UX but operates on in-memory data.\n * Sort state is stored in the DataSheet zustand store; filtering uses the\n * existing `setFilter` / `removeFilter` mechanism with auto-generated\n * predicate filters for simple text search.\n */\nimport h from \"@macrostrat/hyper\";\nimport { ColumnHeaderCell, RegionCardinality } from \"@blueprintjs/table\";\nimport { Button, Icon, Menu, MenuItem } from \"@blueprintjs/core\";\nimport { ctx, tableActionsAtom, useStoreAPI } from \"../provider\";\nimport { buildActionContext } from \"../actions/selection\";\nimport type { ColumnSpec } from \"../utils/column-spec\";\nimport type {\n PostgrestColumnFilter,\n ColumnSortEntry,\n} from \"../postgrest-table\";\n\nexport interface ColumnActionsConfig {\n activeSort?: ColumnSortEntry | null;\n activeFilter?: PostgrestColumnFilter | null;\n}\n\nexport interface ColumnHeaderRendererProps extends ColumnActionsConfig {\n col: ColumnSpec;\n colIndex: number;\n //actions: ColumnHeaderActions;\n}\n\n// ---- Column header cell ----\n\n/** Column header cell whose dropdown renders the `FULL_COLUMNS` controls\n * (sort/filter + any custom column actions) from the shared action registry,\n * scoped to this column. */\nexport function renderColumnHeaderCell({\n col,\n colIndex,\n activeSort,\n activeFilter,\n}: ColumnHeaderRendererProps) {\n const isSortable = col.sortable === true;\n const isFilterable =\n col.filterable === true ||\n typeof col.filterable === \"object\" ||\n (Array.isArray(col.filters) && col.filters.length > 0);\n const hasCustomActions =\n Array.isArray((col as any).actions) && (col as any).actions.length > 0;\n\n if (!isSortable && !isFilterable && !hasCustomActions) {\n return h(ColumnHeaderCell, { name: col.name });\n }\n\n // `activeFilter` is the active store entry targeting this column (any filter\n // type), or null — so the indicator lights for rich and operator filters.\n const hasFilterActive = activeFilter != null;\n const hasSortActive = activeSort != null;\n\n return h(ColumnHeaderCell, {\n name: col.name,\n // Persistent interaction bar so the menu caret is always clickable — the\n // hover-triggered caret was blocked by the selection overlay when the\n // column was selected.\n enableColumnInteractionBar: true,\n nameRenderer: () =>\n h(ColumnHeaderName, { col, hasSortActive, hasFilterActive, activeSort }),\n menuRenderer: () => h(ColumnHeaderControls, { colIndex }),\n });\n}\n\n/** Column name with active sort/filter indicator icons. */\nfunction ColumnHeaderName({ col, hasSortActive, hasFilterActive, activeSort }) {\n return h(\n \"div\",\n { style: { display: \"flex\", alignItems: \"center\", width: \"100%\" } },\n [\n h(\n \"span\",\n {\n style: {\n flex: 1,\n overflow: \"hidden\",\n textOverflow: \"ellipsis\",\n whiteSpace: \"nowrap\",\n },\n },\n col.name,\n ),\n h.if(hasSortActive || hasFilterActive)(\n \"span\",\n {\n style: {\n display: \"flex\",\n alignItems: \"center\",\n gap: \"2px\",\n marginLeft: \"4px\",\n flexShrink: 0,\n },\n },\n [\n h.if(hasSortActive)(Icon, {\n icon: activeSort?.ascending ? \"sort-asc\" : \"sort-desc\",\n size: 12,\n style: { color: \"var(--intent-primary, #2965cc)\" },\n }),\n h.if(hasFilterActive)(Icon, {\n icon: \"filter\",\n size: 12,\n style: { color: \"var(--intent-warning, #d99e0b)\" },\n }),\n ],\n ),\n ],\n );\n}\n\n/** Dropdown content: the `FULL_COLUMNS` controls for this column, sourced from\n * the shared action registry and scoped to the column via a synthetic\n * single-column selection context — so the header and toolbar render the same\n * sort/filter (and custom column) controls. */\nfunction ColumnHeaderControls({ colIndex }: { colIndex: number }) {\n const storeAPI = useStoreAPI();\n const actions = ctx.useValue(tableActionsAtom);\n\n // Scope the action context to this column (as if it were the selection).\n const actionCtx = buildActionContext(\n {\n ...storeAPI.getState(),\n selection: [{ cols: [colIndex, colIndex], rows: undefined }],\n } as any,\n storeAPI.setState,\n );\n\n const controls = actions.filter(\n (a) =>\n a.targets.includes(RegionCardinality.FULL_COLUMNS) &&\n (a.appliesTo?.(actionCtx) ?? true),\n );\n\n const rendered = controls\n .map((a) =>\n a.render != null\n ? a.render(actionCtx)\n : h(\n Button,\n {\n key: a.id,\n small: true,\n minimal: true,\n icon: a.icon,\n intent: a.intent,\n onClick: () => a.run?.(actionCtx),\n },\n a.name,\n ),\n )\n .filter(Boolean);\n\n if (rendered.length === 0) {\n return h(Menu, [h(MenuItem, { text: \"No options\", disabled: true })]);\n }\n\n return h(\n \"div.column-header-controls\",\n {\n style: {\n padding: \"8px\",\n display: \"flex\",\n flexDirection: \"column\",\n gap: \"6px\",\n alignItems: \"flex-start\",\n },\n },\n rendered,\n );\n}\n"],"names":["h","ColumnHeaderCell","Icon","useStoreAPI","ctx","tableActionsAtom","buildActionContext","RegionCardinality","Button","Menu","MenuItem"],"mappings":";;;;;;;;;AAmCO,SAAS,uBAAuB;AAAA,EACrC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,GAA8B;AAC5B,QAAM,aAAa,IAAI,aAAa;AACpC,QAAM,eACJ,IAAI,eAAe,QACnB,OAAO,IAAI,eAAe,YACzB,MAAM,QAAQ,IAAI,OAAO,KAAK,IAAI,QAAQ,SAAS;AACtD,QAAM,mBACJ,MAAM,QAAS,IAAY,OAAO,KAAM,IAAY,QAAQ,SAAS;AAEvE,MAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,kBAAkB;AACrD,WAAOA,WAAAA,QAAEC,MAAAA,kBAAkB,EAAE,MAAM,IAAI,MAAM;AAAA,EAC/C;AAIA,QAAM,kBAAkB,gBAAgB;AACxC,QAAM,gBAAgB,cAAc;AAEpC,SAAOD,WAAAA,QAAEC,MAAAA,kBAAkB;AAAA,IACzB,MAAM,IAAI;AAAA;AAAA;AAAA;AAAA,IAIV,4BAA4B;AAAA,IAC5B,cAAc,MACZD,WAAAA,QAAE,kBAAkB,EAAE,KAAK,eAAe,iBAAiB,YAAY;AAAA,IACzE,cAAc,MAAMA,WAAAA,QAAE,sBAAsB,EAAE,UAAU;AAAA,EAAA,CACzD;AACH;AAGA,SAAS,iBAAiB,EAAE,KAAK,eAAe,iBAAiB,cAAc;AAC7E,SAAOA,WAAAA;AAAAA,IACL;AAAA,IACA,EAAE,OAAO,EAAE,SAAS,QAAQ,YAAY,UAAU,OAAO,SAAO;AAAA,IAChE;AAAA,MACEA,WAAAA;AAAAA,QACE;AAAA,QACA;AAAA,UACE,OAAO;AAAA,YACL,MAAM;AAAA,YACN,UAAU;AAAA,YACV,cAAc;AAAA,YACd,YAAY;AAAA,UAAA;AAAA,QACd;AAAA,QAEF,IAAI;AAAA,MAAA;AAAA,MAENA,mBAAE,GAAG,iBAAiB,eAAe;AAAA,QACnC;AAAA,QACA;AAAA,UACE,OAAO;AAAA,YACL,SAAS;AAAA,YACT,YAAY;AAAA,YACZ,KAAK;AAAA,YACL,YAAY;AAAA,YACZ,YAAY;AAAA,UAAA;AAAA,QACd;AAAA,QAEF;AAAA,UACEA,WAAAA,QAAE,GAAG,aAAa,EAAEE,WAAM;AAAA,YACxB,MAAM,YAAY,YAAY,aAAa;AAAA,YAC3C,MAAM;AAAA,YACN,OAAO,EAAE,OAAO,iCAAA;AAAA,UAAiC,CAClD;AAAA,UACDF,WAAAA,QAAE,GAAG,eAAe,EAAEE,WAAM;AAAA,YAC1B,MAAM;AAAA,YACN,MAAM;AAAA,YACN,OAAO,EAAE,OAAO,iCAAA;AAAA,UAAiC,CAClD;AAAA,QAAA;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAEJ;AAMA,SAAS,qBAAqB,EAAE,YAAkC;AAChE,QAAM,WAAWC,SAAAA,YAAA;AACjB,QAAM,UAAUC,SAAAA,IAAI,SAASC,yBAAgB;AAG7C,QAAM,YAAYC,UAAAA;AAAAA,IAChB;AAAA,MACE,GAAG,SAAS,SAAA;AAAA,MACZ,WAAW,CAAC,EAAE,MAAM,CAAC,UAAU,QAAQ,GAAG,MAAM,OAAA,CAAW;AAAA,IAAA;AAAA,IAE7D,SAAS;AAAA,EAAA;AAGX,QAAM,WAAW,QAAQ;AAAA,IACvB,CAAC,MACC,EAAE,QAAQ,SAASC,MAAAA,kBAAkB,YAAY,MAChD,EAAE,YAAY,SAAS,KAAK;AAAA,EAAA;AAGjC,QAAM,WAAW,SACd;AAAA,IAAI,CAAC,MACJ,EAAE,UAAU,OACR,EAAE,OAAO,SAAS,IAClBP,WAAAA;AAAAA,MACEQ,KAAAA;AAAAA,MACA;AAAA,QACE,KAAK,EAAE;AAAA,QACP,OAAO;AAAA,QACP,SAAS;AAAA,QACT,MAAM,EAAE;AAAA,QACR,QAAQ,EAAE;AAAA,QACV,SAAS,MAAM,EAAE,MAAM,SAAS;AAAA,MAAA;AAAA,MAElC,EAAE;AAAA,IAAA;AAAA,EACJ,EAEL,OAAO,OAAO;AAEjB,MAAI,SAAS,WAAW,GAAG;AACzB,WAAOR,mBAAES,KAAAA,MAAM,CAACT,WAAAA,QAAEU,KAAAA,UAAU,EAAE,MAAM,cAAc,UAAU,KAAA,CAAM,CAAC,CAAC;AAAA,EACtE;AAEA,SAAOV,WAAAA;AAAAA,IACL;AAAA,IACA;AAAA,MACE,OAAO;AAAA,QACL,SAAS;AAAA,QACT,SAAS;AAAA,QACT,eAAe;AAAA,QACf,KAAK;AAAA,QACL,YAAY;AAAA,MAAA;AAAA,IACd;AAAA,IAEF;AAAA,EAAA;AAEJ;;"}
|
|
@@ -9,22 +9,7 @@ export interface ColumnHeaderRendererProps extends ColumnActionsConfig {
|
|
|
9
9
|
col: ColumnSpec;
|
|
10
10
|
colIndex: number;
|
|
11
11
|
}
|
|
12
|
-
/**
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
* Reads sort state from the store and manages column filters via
|
|
16
|
-
* the existing `setFilter`/`removeFilter` store methods. */
|
|
12
|
+
/** Column header cell whose dropdown renders the `FULL_COLUMNS` controls
|
|
13
|
+
* (sort/filter + any custom column actions) from the shared action registry,
|
|
14
|
+
* scoped to this column. */
|
|
17
15
|
export declare function renderColumnHeaderCell({ col, colIndex, activeSort, activeFilter, }: ColumnHeaderRendererProps): import('react').DetailedReactHTMLElement<import('react').InputHTMLAttributes<HTMLInputElement>, HTMLInputElement> | import('react').ComponentElement<import('@blueprintjs/table').ColumnHeaderCellProps, ColumnHeaderCell>;
|
|
18
|
-
/** Bar showing active client-side sort and filter state as removable tags.
|
|
19
|
-
* Rendered automatically by `_DataSheet` when sorts or column filters
|
|
20
|
-
* are active. */
|
|
21
|
-
export declare function SortFilterBar(): import('react').DetailedReactHTMLElement<{
|
|
22
|
-
style: {
|
|
23
|
-
display: "flex";
|
|
24
|
-
flexDirection: "row";
|
|
25
|
-
flexWrap: "wrap";
|
|
26
|
-
gap: string;
|
|
27
|
-
marginBottom: string;
|
|
28
|
-
alignItems: "center";
|
|
29
|
-
};
|
|
30
|
-
}, HTMLElement> | null;
|