@macrostrat/data-sheet 2.2.2 → 2.2.4
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 +11 -0
- package/dist/esm/data-sheet.186dcac8.js +86 -0
- package/dist/esm/data-sheet.186dcac8.js.map +1 -0
- package/dist/esm/{data-sheet.ce2a3218.js → data-sheet.2e11f097.js} +5 -5
- package/dist/esm/{data-sheet.ce2a3218.js.map → data-sheet.2e11f097.js.map} +1 -1
- package/dist/esm/data-sheet.37e35216.js.map +1 -1
- package/dist/esm/{data-sheet.ce24dcf9.js → data-sheet.403b9693.js} +104 -130
- package/dist/esm/data-sheet.403b9693.js.map +1 -0
- package/dist/esm/{data-sheet.b5946d6b.js → data-sheet.40866550.js} +6 -27
- package/dist/esm/data-sheet.40866550.js.map +1 -0
- package/dist/esm/{data-sheet.6021b6c9.js → data-sheet.53ee5bf7.js} +25 -15
- package/dist/esm/data-sheet.53ee5bf7.js.map +1 -0
- package/dist/esm/{data-sheet.a0d5d18d.js → data-sheet.560943e5.js} +4 -4
- package/dist/esm/{data-sheet.a0d5d18d.js.map → data-sheet.560943e5.js.map} +1 -1
- package/dist/esm/{data-sheet.ae6daf58.js → data-sheet.8dbfccef.js} +4 -2
- package/dist/esm/data-sheet.8dbfccef.js.map +1 -0
- package/dist/esm/{data-sheet.1d6ac6c6.js → data-sheet.9a4e4e01.js} +13 -24
- package/dist/esm/data-sheet.9a4e4e01.js.map +1 -0
- package/dist/esm/{data-sheet.91223ec6.css → data-sheet.a7230b2f.css} +3 -3
- package/dist/esm/data-sheet.a7230b2f.css.map +1 -0
- package/dist/esm/{data-sheet.45e8d3b0.js → data-sheet.c9b6b6f2.js} +66 -8
- package/dist/esm/data-sheet.c9b6b6f2.js.map +1 -0
- package/dist/esm/{data-sheet.aa2b4902.js → data-sheet.d2160988.js} +2 -1
- package/dist/esm/data-sheet.d2160988.js.map +1 -0
- package/dist/esm/index.d.ts +59 -40
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +6 -6
- package/dist/node/data-sheet.3c728e09.js +2 -0
- package/dist/node/data-sheet.3c728e09.js.map +1 -0
- package/dist/node/data-sheet.474755ec.js +2 -0
- package/dist/node/data-sheet.474755ec.js.map +1 -0
- package/dist/node/{data-sheet.846d5f8f.js → data-sheet.648db7af.js} +2 -2
- package/dist/node/data-sheet.648db7af.js.map +1 -0
- package/dist/node/data-sheet.97ac1b50.js +2 -0
- package/dist/node/data-sheet.97ac1b50.js.map +1 -0
- package/dist/node/data-sheet.ae543670.js +2 -0
- package/dist/node/data-sheet.ae543670.js.map +1 -0
- package/dist/node/data-sheet.afb25a47.js +2 -0
- package/dist/node/data-sheet.afb25a47.js.map +1 -0
- package/dist/node/{data-sheet.2f64274d.css → data-sheet.c90cb14b.css} +2 -2
- package/dist/node/data-sheet.c90cb14b.css.map +1 -0
- package/dist/node/data-sheet.d971095a.js +2 -0
- package/dist/node/data-sheet.d971095a.js.map +1 -0
- package/dist/node/data-sheet.dffdda71.js +2 -0
- package/dist/node/data-sheet.dffdda71.js.map +1 -0
- package/dist/node/data-sheet.e472411d.js +2 -0
- package/dist/node/data-sheet.e472411d.js.map +1 -0
- package/dist/node/{data-sheet.d40ac2ae.js → data-sheet.ef0c95f4.js} +2 -2
- package/dist/node/{data-sheet.d40ac2ae.js.map → data-sheet.ef0c95f4.js.map} +1 -1
- package/dist/node/index.js +1 -1
- package/dist/node/index.js.map +1 -1
- package/package.json +5 -6
- package/src/components/colors.ts +25 -12
- package/src/components/editor-popup.ts +13 -24
- package/src/components/main.module.sass +3 -7
- package/src/components/text-areas.ts +2 -43
- package/src/core.ts +136 -155
- package/src/postgrest-table/data-loaders.ts +1 -0
- package/src/provider.ts +82 -9
- package/src/utils/index.ts +1 -0
- package/src/utils/key-handling.ts +132 -0
- package/dist/esm/data-sheet.1d6ac6c6.js.map +0 -1
- package/dist/esm/data-sheet.45e8d3b0.js.map +0 -1
- package/dist/esm/data-sheet.6021b6c9.js.map +0 -1
- package/dist/esm/data-sheet.91223ec6.css.map +0 -1
- package/dist/esm/data-sheet.aa2b4902.js.map +0 -1
- package/dist/esm/data-sheet.ae6daf58.js.map +0 -1
- package/dist/esm/data-sheet.b5946d6b.js.map +0 -1
- package/dist/esm/data-sheet.ce24dcf9.js.map +0 -1
- package/dist/node/data-sheet.171105c1.js +0 -2
- package/dist/node/data-sheet.171105c1.js.map +0 -1
- package/dist/node/data-sheet.1a487c3c.js +0 -2
- package/dist/node/data-sheet.1a487c3c.js.map +0 -1
- package/dist/node/data-sheet.2f64274d.css.map +0 -1
- package/dist/node/data-sheet.4a8fd8a7.js +0 -2
- package/dist/node/data-sheet.4a8fd8a7.js.map +0 -1
- package/dist/node/data-sheet.846d5f8f.js.map +0 -1
- package/dist/node/data-sheet.86550c41.js +0 -2
- package/dist/node/data-sheet.86550c41.js.map +0 -1
- package/dist/node/data-sheet.a65463ef.js +0 -2
- package/dist/node/data-sheet.a65463ef.js.map +0 -1
- package/dist/node/data-sheet.bfbba3fc.js +0 -2
- package/dist/node/data-sheet.bfbba3fc.js.map +0 -1
- package/dist/node/data-sheet.f3404ed5.js +0 -2
- package/dist/node/data-sheet.f3404ed5.js.map +0 -1
package/src/components/colors.ts
CHANGED
|
@@ -6,10 +6,10 @@ import {
|
|
|
6
6
|
asChromaColor,
|
|
7
7
|
getLuminanceAdjustedColorScheme,
|
|
8
8
|
} from "@macrostrat/color-utils";
|
|
9
|
-
import {
|
|
10
|
-
import { useEffect, useRef } from "react";
|
|
9
|
+
import { useEffect, useMemo, useRef, useState } from "react";
|
|
11
10
|
import { memoize } from "underscore";
|
|
12
|
-
import
|
|
11
|
+
import Sketch from "@uiw/react-color-sketch";
|
|
12
|
+
import classNames from "classnames";
|
|
13
13
|
|
|
14
14
|
const h = hyper.styled(styles);
|
|
15
15
|
|
|
@@ -19,10 +19,13 @@ export function ColorCell({
|
|
|
19
19
|
style,
|
|
20
20
|
intent,
|
|
21
21
|
adjustLuminance = true,
|
|
22
|
+
className,
|
|
22
23
|
...rest
|
|
23
24
|
}) {
|
|
24
25
|
const darkMode = useInDarkMode();
|
|
25
26
|
|
|
27
|
+
const _className = classNames(className, "color-cell");
|
|
28
|
+
|
|
26
29
|
let mainColor = "var(--text-color)";
|
|
27
30
|
let backgroundColor = value;
|
|
28
31
|
|
|
@@ -35,9 +38,16 @@ export function ColorCell({
|
|
|
35
38
|
}
|
|
36
39
|
}
|
|
37
40
|
|
|
41
|
+
if (intent != null) {
|
|
42
|
+
// If an intent is specified, override the main color
|
|
43
|
+
mainColor = undefined;
|
|
44
|
+
}
|
|
45
|
+
|
|
38
46
|
return h(
|
|
39
47
|
Cell,
|
|
40
48
|
{
|
|
49
|
+
intent,
|
|
50
|
+
className: _className,
|
|
41
51
|
...rest,
|
|
42
52
|
style: {
|
|
43
53
|
color: mainColor,
|
|
@@ -70,6 +80,7 @@ enum ColorConversionType {
|
|
|
70
80
|
export function ColorPicker({
|
|
71
81
|
value,
|
|
72
82
|
onChange,
|
|
83
|
+
editable = true,
|
|
73
84
|
type = ColorConversionType.CSS,
|
|
74
85
|
}) {
|
|
75
86
|
const ref = useRef(null);
|
|
@@ -78,17 +89,18 @@ export function ColorPicker({
|
|
|
78
89
|
ref.current.focus();
|
|
79
90
|
}, []);
|
|
80
91
|
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
92
|
+
const color = useMemo(() => {
|
|
93
|
+
try {
|
|
94
|
+
return asChromaColor(value).hex();
|
|
95
|
+
} catch {
|
|
96
|
+
return "#aaaaaa";
|
|
97
|
+
}
|
|
98
|
+
}, [value]);
|
|
99
|
+
|
|
87
100
|
return h(
|
|
88
101
|
"div.color-picker-container",
|
|
89
102
|
{
|
|
90
103
|
onKeyDown(evt) {
|
|
91
|
-
console.log(evt);
|
|
92
104
|
if (evt.key === "Escape") {
|
|
93
105
|
evt.preventDefault();
|
|
94
106
|
}
|
|
@@ -96,10 +108,11 @@ export function ColorPicker({
|
|
|
96
108
|
ref,
|
|
97
109
|
tabIndex: 0,
|
|
98
110
|
},
|
|
99
|
-
h(
|
|
111
|
+
h(Sketch, {
|
|
100
112
|
color,
|
|
113
|
+
disableAlpha: true,
|
|
101
114
|
onChange(color) {
|
|
102
|
-
onChange(asChromaColor(color)[type]());
|
|
115
|
+
onChange(asChromaColor(color.hexa)[type]());
|
|
103
116
|
},
|
|
104
117
|
}),
|
|
105
118
|
);
|
|
@@ -3,20 +3,22 @@ import { ErrorBoundary } from "@macrostrat/ui-components";
|
|
|
3
3
|
import { Popover } from "@blueprintjs/core";
|
|
4
4
|
import styles from "./main.module.sass";
|
|
5
5
|
import { useRef, useState } from "react";
|
|
6
|
+
import { useSelector } from "../provider";
|
|
6
7
|
|
|
7
8
|
const h = hyper.styled(styles);
|
|
8
9
|
|
|
9
10
|
export function EditorPopup(props) {
|
|
10
11
|
const {
|
|
11
12
|
children,
|
|
12
|
-
content,
|
|
13
13
|
targetClassName,
|
|
14
14
|
autoFocus,
|
|
15
15
|
valueViewer,
|
|
16
|
-
|
|
16
|
+
placement = "right-start",
|
|
17
|
+
minimal = true,
|
|
17
18
|
} = props;
|
|
18
19
|
|
|
19
20
|
const [isOpen, setIsOpen] = useState(autoFocus);
|
|
21
|
+
const keyHandler = useSelector((state) => state.keyHandler);
|
|
20
22
|
|
|
21
23
|
const ref = useRef(null);
|
|
22
24
|
|
|
@@ -25,19 +27,7 @@ export function EditorPopup(props) {
|
|
|
25
27
|
h("input.hidden-editor", {
|
|
26
28
|
value: "",
|
|
27
29
|
autoFocus: true,
|
|
28
|
-
onKeyDown
|
|
29
|
-
if (e.key == "Enter") {
|
|
30
|
-
setIsOpen(true);
|
|
31
|
-
e.preventDefault();
|
|
32
|
-
e.stopPropagation();
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
if (e.key == "Escape") {
|
|
36
|
-
e.preventDefault();
|
|
37
|
-
e.stopPropagation();
|
|
38
|
-
return;
|
|
39
|
-
}
|
|
40
|
-
},
|
|
30
|
+
onKeyDown: keyHandler,
|
|
41
31
|
}),
|
|
42
32
|
]);
|
|
43
33
|
|
|
@@ -52,28 +42,27 @@ export function EditorPopup(props) {
|
|
|
52
42
|
},
|
|
53
43
|
onKeyDown(evt) {
|
|
54
44
|
if (evt.key === "Escape") {
|
|
55
|
-
|
|
56
|
-
|
|
45
|
+
if (isOpen) {
|
|
46
|
+
setIsOpen(false);
|
|
47
|
+
}
|
|
57
48
|
evt.stopPropagation();
|
|
49
|
+
evt.preventDefault();
|
|
50
|
+
return;
|
|
58
51
|
}
|
|
59
52
|
// Climb over the interaction barrier to propagate the key event to the table
|
|
60
|
-
//ref.current.dispatchEvent(new KeyboardEvent("keydown", evt));
|
|
61
53
|
},
|
|
62
54
|
},
|
|
63
|
-
h(ErrorBoundary, null,
|
|
55
|
+
h(ErrorBoundary, null, children),
|
|
64
56
|
),
|
|
65
57
|
enforceFocus: false,
|
|
66
58
|
autoFocus: false,
|
|
67
|
-
minimal
|
|
59
|
+
minimal,
|
|
68
60
|
modifiers: {
|
|
69
61
|
offset: { enabled: true, options: { offset: [0, 8] } },
|
|
70
62
|
},
|
|
63
|
+
placement,
|
|
71
64
|
interactionKind: "hover-target",
|
|
72
65
|
isOpen,
|
|
73
|
-
onClose(evt) {
|
|
74
|
-
//props.onKeyDown?.(evt);
|
|
75
|
-
//setIsOpen(false);
|
|
76
|
-
},
|
|
77
66
|
// Portal must be used to avoid issues with the editor being clipped to the bounds of the cell
|
|
78
67
|
usePortal: true,
|
|
79
68
|
},
|
|
@@ -37,13 +37,8 @@
|
|
|
37
37
|
|
|
38
38
|
// Color picker
|
|
39
39
|
.color-picker-container
|
|
40
|
-
:global
|
|
41
|
-
|
|
42
|
-
border-radius: 0
|
|
43
|
-
|
|
44
|
-
.react-colorful__hue
|
|
45
|
-
border-radius: 0
|
|
46
|
-
|
|
40
|
+
:global .w-color-sketch
|
|
41
|
+
--sketch-background: var(--secondary-background) !important
|
|
47
42
|
|
|
48
43
|
.color-swatch
|
|
49
44
|
width: 18px
|
|
@@ -66,3 +61,4 @@
|
|
|
66
61
|
position: relative
|
|
67
62
|
flex-grow: 1
|
|
68
63
|
display: block
|
|
64
|
+
|
|
@@ -2,6 +2,7 @@ import hyper from "@macrostrat/hyper";
|
|
|
2
2
|
import styles from "./main.module.sass";
|
|
3
3
|
import { Button } from "@blueprintjs/core";
|
|
4
4
|
import { useEffect, useRef } from "react";
|
|
5
|
+
import { multiLineTextKeyHandler } from "../utils";
|
|
5
6
|
|
|
6
7
|
const h = hyper.styled(styles);
|
|
7
8
|
|
|
@@ -22,23 +23,7 @@ export function EditableTextArea({ value, onChange }) {
|
|
|
22
23
|
ref,
|
|
23
24
|
value: value ?? "",
|
|
24
25
|
onChange: (evt) => onChange(evt.target.value),
|
|
25
|
-
onKeyDown:
|
|
26
|
-
if (evt.key === "Enter") {
|
|
27
|
-
//evt.preventDefault();
|
|
28
|
-
evt.stopPropagation();
|
|
29
|
-
return;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
if (evt.key === "Escape") {
|
|
33
|
-
evt.preventDefault();
|
|
34
|
-
return;
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
const shouldPropagate = handleSpecialKeys(evt, evt.target);
|
|
38
|
-
if (!shouldPropagate) {
|
|
39
|
-
evt.stopPropagation();
|
|
40
|
-
}
|
|
41
|
-
},
|
|
26
|
+
onKeyDown: multiLineTextKeyHandler,
|
|
42
27
|
}),
|
|
43
28
|
h("div.tools", [
|
|
44
29
|
h(Button, {
|
|
@@ -61,29 +46,3 @@ export function EditableTextArea({ value, onChange }) {
|
|
|
61
46
|
]),
|
|
62
47
|
]);
|
|
63
48
|
}
|
|
64
|
-
|
|
65
|
-
export function handleSpecialKeys(evt, target): boolean {
|
|
66
|
-
if (
|
|
67
|
-
(evt.key === "ArrowLeft" ||
|
|
68
|
-
evt.key === "ArrowUp" ||
|
|
69
|
-
evt.key === "ArrowDown") &&
|
|
70
|
-
target.selectionStart === 0
|
|
71
|
-
) {
|
|
72
|
-
target.blur();
|
|
73
|
-
return true;
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
if (
|
|
77
|
-
(evt.key === "ArrowRight" ||
|
|
78
|
-
evt.key === "ArrowUp" ||
|
|
79
|
-
evt.key === "Tab" ||
|
|
80
|
-
evt.key === "Enter" ||
|
|
81
|
-
evt.key === "ArrowDown") &&
|
|
82
|
-
target.selectionStart === evt.target.value.length
|
|
83
|
-
) {
|
|
84
|
-
target.blur();
|
|
85
|
-
return true;
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
return false;
|
|
89
|
-
}
|
package/src/core.ts
CHANGED
|
@@ -16,7 +16,7 @@ import "@blueprintjs/table/lib/css/table.css";
|
|
|
16
16
|
import hyper from "@macrostrat/hyper";
|
|
17
17
|
import update from "immutability-helper";
|
|
18
18
|
import { ReactNode, useCallback, useEffect, useMemo, useState } from "react";
|
|
19
|
-
import { EditorPopup,
|
|
19
|
+
import { EditorPopup, DataSheetAction } from "./components";
|
|
20
20
|
import styles from "./main.module.sass";
|
|
21
21
|
import {
|
|
22
22
|
DataSheetProvider,
|
|
@@ -27,7 +27,7 @@ import {
|
|
|
27
27
|
useStoreAPI,
|
|
28
28
|
VisibleCells,
|
|
29
29
|
} from "./provider";
|
|
30
|
-
import
|
|
30
|
+
import { ColumnSpec } from "./utils";
|
|
31
31
|
|
|
32
32
|
const h = hyper.styled(styles);
|
|
33
33
|
|
|
@@ -66,6 +66,7 @@ export function DataSheet<T>(props: DataSheetProps<T>) {
|
|
|
66
66
|
editable = true,
|
|
67
67
|
enableColumnReordering = false,
|
|
68
68
|
enableFocusedCell = false,
|
|
69
|
+
defaultColumnWidth = 150,
|
|
69
70
|
...rest
|
|
70
71
|
} = props;
|
|
71
72
|
|
|
@@ -78,6 +79,7 @@ export function DataSheet<T>(props: DataSheetProps<T>) {
|
|
|
78
79
|
columnSpec,
|
|
79
80
|
columnSpecOptions: columnSpecOptions,
|
|
80
81
|
enableColumnReordering,
|
|
82
|
+
defaultColumnWidth,
|
|
81
83
|
editable,
|
|
82
84
|
...rest,
|
|
83
85
|
},
|
|
@@ -111,7 +113,7 @@ function _DataSheet<T>({
|
|
|
111
113
|
|
|
112
114
|
// For now, we only consider a single cell "focused" when we have one cell selected.
|
|
113
115
|
// Multi-cell selections have a different set of "bulk" actions.
|
|
114
|
-
const
|
|
116
|
+
const selectedRegions = useSelector<T>((state) => state.selection);
|
|
115
117
|
|
|
116
118
|
const data = useSelector((state) => state.data);
|
|
117
119
|
const editable = useSelector((state) => state.editable);
|
|
@@ -163,8 +165,8 @@ function _DataSheet<T>({
|
|
|
163
165
|
const deleteSelectedRows = useSelector((state) => state.deleteSelectedRows);
|
|
164
166
|
const _onDeleteRows = useCallback(() => {
|
|
165
167
|
deleteSelectedRows();
|
|
166
|
-
onDeleteRows?.(
|
|
167
|
-
}, [onDeleteRows,
|
|
168
|
+
onDeleteRows?.(selectedRegions);
|
|
169
|
+
}, [onDeleteRows, selectedRegions, deleteSelectedRows]);
|
|
168
170
|
|
|
169
171
|
useEffect(() => {
|
|
170
172
|
if (!verbose) return;
|
|
@@ -177,12 +179,15 @@ function _DataSheet<T>({
|
|
|
177
179
|
|
|
178
180
|
useEffect(() => {
|
|
179
181
|
if (!verbose) return;
|
|
180
|
-
console.log("
|
|
181
|
-
}, [
|
|
182
|
+
console.log("Selected regions", selectedRegions);
|
|
183
|
+
}, [selectedRegions]);
|
|
182
184
|
|
|
183
|
-
|
|
185
|
+
const nDeletionCandidates = useMemo(
|
|
186
|
+
() => getRowsToDelete(selectedRegions).length,
|
|
187
|
+
[selectedRegions],
|
|
188
|
+
);
|
|
184
189
|
|
|
185
|
-
const
|
|
190
|
+
const columnWidths = useSelector((state) => state.columnWidths);
|
|
186
191
|
|
|
187
192
|
const numRows = Math.max(updatedData.length, data.length);
|
|
188
193
|
|
|
@@ -208,6 +213,52 @@ function _DataSheet<T>({
|
|
|
208
213
|
};
|
|
209
214
|
}
|
|
210
215
|
|
|
216
|
+
const children = useMemo(
|
|
217
|
+
() =>
|
|
218
|
+
columnSpec.map((col, colIndex) => {
|
|
219
|
+
return h(Column, {
|
|
220
|
+
name: col.name,
|
|
221
|
+
cellRenderer: (rowIndex) => {
|
|
222
|
+
const state = storeAPI.getState();
|
|
223
|
+
return basicCellRenderer<T>(
|
|
224
|
+
rowIndex,
|
|
225
|
+
colIndex,
|
|
226
|
+
col,
|
|
227
|
+
state,
|
|
228
|
+
autoFocusEditor,
|
|
229
|
+
);
|
|
230
|
+
},
|
|
231
|
+
});
|
|
232
|
+
}),
|
|
233
|
+
[columnSpec, storeAPI, autoFocusEditor],
|
|
234
|
+
);
|
|
235
|
+
|
|
236
|
+
const onColumnWidthChanged = useSelector(
|
|
237
|
+
(state) => state.onColumnWidthChanged,
|
|
238
|
+
);
|
|
239
|
+
|
|
240
|
+
const rowHeaderCellRenderer = useCallback(
|
|
241
|
+
(rowIndex: number) => {
|
|
242
|
+
let style = null;
|
|
243
|
+
if (deletedRows.has(rowIndex)) {
|
|
244
|
+
style = {
|
|
245
|
+
opacity: 0.5,
|
|
246
|
+
textDecoration: "line-through",
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
return h(RowHeaderCell, {
|
|
250
|
+
index: rowIndex,
|
|
251
|
+
name: `${rowIndex + 1}`,
|
|
252
|
+
style,
|
|
253
|
+
});
|
|
254
|
+
},
|
|
255
|
+
[deletedRows],
|
|
256
|
+
);
|
|
257
|
+
|
|
258
|
+
const onKeyDown = useSelector((state) => state.tableKeyHandler);
|
|
259
|
+
|
|
260
|
+
if (data == null) return null;
|
|
261
|
+
|
|
211
262
|
return h("div.data-sheet-container", { className, style }, [
|
|
212
263
|
h.if(editable)(DataSheetEditToolbar, {
|
|
213
264
|
onSaveData: _onSaveData,
|
|
@@ -216,92 +267,37 @@ function _DataSheet<T>({
|
|
|
216
267
|
dataSheetActions,
|
|
217
268
|
h(
|
|
218
269
|
"div.data-sheet-holder",
|
|
219
|
-
{
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
},
|
|
243
|
-
},
|
|
244
|
-
[
|
|
245
|
-
h(
|
|
246
|
-
// @ts-expect-error
|
|
247
|
-
Table2,
|
|
248
|
-
{
|
|
249
|
-
ref,
|
|
250
|
-
numRows,
|
|
251
|
-
className: "data-sheet",
|
|
252
|
-
enableFocusedCell,
|
|
253
|
-
enableColumnReordering,
|
|
254
|
-
//onColumnsReordered,
|
|
270
|
+
{ onKeyDown },
|
|
271
|
+
h(
|
|
272
|
+
// @ts-expect-error
|
|
273
|
+
Table2,
|
|
274
|
+
{
|
|
275
|
+
ref,
|
|
276
|
+
numRows,
|
|
277
|
+
className: "data-sheet",
|
|
278
|
+
enableFocusedCell,
|
|
279
|
+
enableColumnReordering,
|
|
280
|
+
//onColumnsReordered,
|
|
281
|
+
focusedCell,
|
|
282
|
+
selectedRegions,
|
|
283
|
+
defaultRowHeight: rowHeight,
|
|
284
|
+
minRowHeight: rowHeight,
|
|
285
|
+
columnWidths,
|
|
286
|
+
onColumnWidthChanged,
|
|
287
|
+
onSelection,
|
|
288
|
+
// The cell renderer is memoized internally based on these data dependencies
|
|
289
|
+
cellRendererDependencies: [
|
|
290
|
+
data,
|
|
291
|
+
//selection,
|
|
292
|
+
updatedData,
|
|
255
293
|
focusedCell,
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
// The cell renderer is memoized internally based on these data dependencies
|
|
264
|
-
cellRendererDependencies: [
|
|
265
|
-
data,
|
|
266
|
-
selection,
|
|
267
|
-
updatedData,
|
|
268
|
-
focusedCell,
|
|
269
|
-
deletedRows,
|
|
270
|
-
],
|
|
271
|
-
onVisibleCellsChange: _onVisibleCellsChange,
|
|
272
|
-
rowHeaderCellRenderer: (rowIndex) => {
|
|
273
|
-
let style = null;
|
|
274
|
-
let intent = undefined;
|
|
275
|
-
if (deletedRows.has(rowIndex)) {
|
|
276
|
-
style = {
|
|
277
|
-
opacity: 0.5,
|
|
278
|
-
textDecoration: "line-through",
|
|
279
|
-
};
|
|
280
|
-
}
|
|
281
|
-
return h(RowHeaderCell, {
|
|
282
|
-
index: rowIndex,
|
|
283
|
-
name: `${rowIndex + 1}`,
|
|
284
|
-
style,
|
|
285
|
-
});
|
|
286
|
-
},
|
|
287
|
-
},
|
|
288
|
-
columnSpec.map((col, colIndex) => {
|
|
289
|
-
return h(Column, {
|
|
290
|
-
name: col.name,
|
|
291
|
-
cellRenderer: (rowIndex) => {
|
|
292
|
-
const state = storeAPI.getState();
|
|
293
|
-
return basicCellRenderer<T>(
|
|
294
|
-
rowIndex,
|
|
295
|
-
colIndex,
|
|
296
|
-
col,
|
|
297
|
-
state,
|
|
298
|
-
autoFocusEditor,
|
|
299
|
-
);
|
|
300
|
-
},
|
|
301
|
-
});
|
|
302
|
-
}),
|
|
303
|
-
),
|
|
304
|
-
],
|
|
294
|
+
deletedRows,
|
|
295
|
+
],
|
|
296
|
+
onVisibleCellsChange: _onVisibleCellsChange,
|
|
297
|
+
rowHeaderCellRenderer,
|
|
298
|
+
},
|
|
299
|
+
children,
|
|
300
|
+
),
|
|
305
301
|
),
|
|
306
302
|
]);
|
|
307
303
|
}
|
|
@@ -329,8 +325,6 @@ function basicCellRenderer<T>(
|
|
|
329
325
|
|
|
330
326
|
const value = updatedData[rowIndex]?.[col.key] ?? data[rowIndex]?.[col.key];
|
|
331
327
|
const _renderedValue = col.valueRenderer?.(value) ?? value;
|
|
332
|
-
let cellContents: ReactNode = _renderedValue;
|
|
333
|
-
const editable = (col.editable ?? state.editable) && !isDeleted;
|
|
334
328
|
|
|
335
329
|
let style = col.style ?? {};
|
|
336
330
|
if (isDeleted) {
|
|
@@ -343,6 +337,9 @@ function basicCellRenderer<T>(
|
|
|
343
337
|
|
|
344
338
|
const focused =
|
|
345
339
|
focusedCell?.col === colIndex && focusedCell?.row === rowIndex;
|
|
340
|
+
|
|
341
|
+
const editable = (col.editable ?? state.editable) && !isDeleted;
|
|
342
|
+
|
|
346
343
|
// Top left cell of a ranged selection
|
|
347
344
|
const topLeft =
|
|
348
345
|
_topLeftCell?.col === colIndex && _topLeftCell?.row === rowIndex;
|
|
@@ -374,24 +371,49 @@ function basicCellRenderer<T>(
|
|
|
374
371
|
style,
|
|
375
372
|
isDeleted,
|
|
376
373
|
},
|
|
377
|
-
|
|
374
|
+
_renderedValue,
|
|
378
375
|
);
|
|
379
376
|
}
|
|
380
377
|
|
|
381
378
|
// The rest is for the top-left cell of a selection or the focused cell
|
|
382
379
|
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
380
|
+
// Hidden input to capture key events
|
|
381
|
+
let hiddenInput = h("input.hidden-input", {
|
|
382
|
+
autoFocus: true,
|
|
383
|
+
onKeyDown: state.editorKeyHandler,
|
|
384
|
+
});
|
|
386
385
|
|
|
387
|
-
|
|
388
|
-
|
|
386
|
+
let cellContents: ReactNode = _renderedValue;
|
|
387
|
+
|
|
388
|
+
let _dataEditor = null;
|
|
389
|
+
let className = null;
|
|
390
|
+
|
|
391
|
+
if (col.dataEditor != null) {
|
|
392
|
+
_dataEditor = h(
|
|
393
|
+
EditorPopup,
|
|
394
|
+
{
|
|
389
395
|
autoFocus: autoFocusEditor,
|
|
390
|
-
|
|
396
|
+
valueViewer: _renderedValue,
|
|
397
|
+
},
|
|
398
|
+
[
|
|
399
|
+
h(col.dataEditor, {
|
|
391
400
|
value,
|
|
401
|
+
editable,
|
|
402
|
+
onChange(value) {
|
|
403
|
+
if (!editable) return;
|
|
404
|
+
state.onSelectionEdited(value);
|
|
405
|
+
},
|
|
392
406
|
}),
|
|
393
|
-
|
|
394
|
-
|
|
407
|
+
],
|
|
408
|
+
);
|
|
409
|
+
}
|
|
410
|
+
|
|
411
|
+
if (!editable) {
|
|
412
|
+
// Most cells are not focused and don't need to be editable.
|
|
413
|
+
// This will be the rendering logic for almost all cells
|
|
414
|
+
|
|
415
|
+
if (_dataEditor != null) {
|
|
416
|
+
cellContents = _dataEditor;
|
|
395
417
|
}
|
|
396
418
|
|
|
397
419
|
return h(
|
|
@@ -401,18 +423,7 @@ function basicCellRenderer<T>(
|
|
|
401
423
|
value,
|
|
402
424
|
style,
|
|
403
425
|
},
|
|
404
|
-
|
|
405
|
-
h.if(!focused)("input.hidden-input", {
|
|
406
|
-
autoFocus: true,
|
|
407
|
-
onKeyDown(e) {
|
|
408
|
-
if (e.key == "Backspace" || e.key == "Delete") {
|
|
409
|
-
clearSelection();
|
|
410
|
-
}
|
|
411
|
-
e.preventDefault();
|
|
412
|
-
},
|
|
413
|
-
}),
|
|
414
|
-
cellContents,
|
|
415
|
-
],
|
|
426
|
+
cellContents,
|
|
416
427
|
);
|
|
417
428
|
// Could probably put the hidden input elsewhere,
|
|
418
429
|
}
|
|
@@ -425,6 +436,8 @@ function basicCellRenderer<T>(
|
|
|
425
436
|
onCellEdited(rowIndex, col.key, e.target.value);
|
|
426
437
|
};
|
|
427
438
|
|
|
439
|
+
const isSingleCellSelection = singleFocusedCell(state.selection) != null;
|
|
440
|
+
|
|
428
441
|
let _inlineEditor: ReactNode = null;
|
|
429
442
|
if (typeof inlineEditor == "boolean") {
|
|
430
443
|
let _value = value;
|
|
@@ -439,56 +452,23 @@ function basicCellRenderer<T>(
|
|
|
439
452
|
value: _value ?? "",
|
|
440
453
|
autoFocus: autoFocusEditor,
|
|
441
454
|
onChange,
|
|
442
|
-
onKeyDown
|
|
443
|
-
console.log("Key down in inline editor", e.key);
|
|
444
|
-
if (e.key == "Enter") {
|
|
445
|
-
e.target.blur();
|
|
446
|
-
}
|
|
447
|
-
|
|
448
|
-
if (e.key == "Escape") {
|
|
449
|
-
e.target.blur();
|
|
450
|
-
e.preventDefault();
|
|
451
|
-
return;
|
|
452
|
-
}
|
|
453
|
-
|
|
454
|
-
const shouldPropagate = handleSpecialKeys(e, e.target);
|
|
455
|
-
if (!shouldPropagate) {
|
|
456
|
-
e.stopPropagation();
|
|
457
|
-
} else {
|
|
458
|
-
e.target.blur();
|
|
459
|
-
//e.target.parentNode.dispatchEvent(new KeyboardEvent("keydown", e));
|
|
460
|
-
}
|
|
461
|
-
},
|
|
455
|
+
onKeyDown: state.editorKeyHandler,
|
|
462
456
|
});
|
|
463
457
|
} else {
|
|
464
458
|
// If inlineEditor is a ReactNode, we use it directly
|
|
465
459
|
_inlineEditor = inlineEditor as ReactNode;
|
|
466
460
|
}
|
|
467
461
|
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
if (col.dataEditor != null) {
|
|
462
|
+
if (_dataEditor != null) {
|
|
471
463
|
className = "editor-cell";
|
|
472
|
-
cellContents =
|
|
473
|
-
|
|
474
|
-
autoFocus: autoFocusEditor,
|
|
475
|
-
content: h(col.dataEditor, {
|
|
476
|
-
value,
|
|
477
|
-
onChange(value) {
|
|
478
|
-
if (!editable) return;
|
|
479
|
-
onCellEdited(rowIndex, col.key, value);
|
|
480
|
-
},
|
|
481
|
-
}),
|
|
482
|
-
valueViewer: _renderedValue,
|
|
483
|
-
}),
|
|
484
|
-
]);
|
|
464
|
+
cellContents = _dataEditor;
|
|
465
|
+
hiddenInput = null;
|
|
485
466
|
} else if (_inlineEditor != null) {
|
|
486
467
|
cellContents = _inlineEditor;
|
|
487
468
|
className = "input-cell";
|
|
469
|
+
hiddenInput = null;
|
|
488
470
|
}
|
|
489
471
|
|
|
490
|
-
const isSingleCellSelection = singleFocusedCell(state.selection) != null;
|
|
491
|
-
|
|
492
472
|
// Hidden html input
|
|
493
473
|
return h(
|
|
494
474
|
_Cell,
|
|
@@ -504,6 +484,7 @@ function basicCellRenderer<T>(
|
|
|
504
484
|
h.if(editable && isSingleCellSelection)(DragHandle, {
|
|
505
485
|
focusedCell,
|
|
506
486
|
}),
|
|
487
|
+
hiddenInput,
|
|
507
488
|
],
|
|
508
489
|
);
|
|
509
490
|
}
|