@macrostrat/data-sheet 2.0.2 → 2.1.0
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 +10 -0
- package/README.md +17 -10
- package/dist/esm/{postgrest-table.d4e0260e.js → data-sheet.00171fc5.js} +76 -61
- package/dist/esm/data-sheet.00171fc5.js.map +1 -0
- package/dist/esm/{utils.5d81fe80.js → data-sheet.0adfe599.js} +2 -2
- package/dist/esm/{utils.5d81fe80.js.map → data-sheet.0adfe599.js.map} +1 -1
- package/dist/esm/{editor-popup.819ce365.js → data-sheet.1d6ac6c6.js} +28 -8
- package/dist/esm/data-sheet.1d6ac6c6.js.map +1 -0
- package/dist/esm/{data-loaders.b7de291b.js → data-sheet.2773da15.js} +12 -3
- package/dist/esm/data-sheet.2773da15.js.map +1 -0
- package/dist/esm/{main.module.7e0903d4.js → data-sheet.37e35216.js} +16 -1
- package/dist/esm/data-sheet.37e35216.js.map +1 -0
- package/dist/esm/{column-spec.e56f4d75.js → data-sheet.410c5122.js} +20 -7
- package/dist/esm/data-sheet.410c5122.js.map +1 -0
- package/dist/esm/{main.module.83442ac4.js → data-sheet.48635112.js} +4 -1
- package/dist/esm/data-sheet.48635112.js.map +1 -0
- package/dist/esm/{actions.module.560a3136.js → data-sheet.54cfa8e8.js} +1 -1
- package/dist/esm/{actions.module.560a3136.js.map → data-sheet.54cfa8e8.js.map} +1 -1
- package/dist/esm/{colors.75a92ad3.js → data-sheet.6021b6c9.js} +30 -21
- package/dist/esm/data-sheet.6021b6c9.js.map +1 -0
- package/dist/esm/{actions.module.684172fa.css → data-sheet.706f955d.css} +1 -1
- package/dist/esm/{actions.module.684172fa.css.map → data-sheet.706f955d.css.map} +1 -1
- package/dist/esm/{main.module.658cf7b2.css → data-sheet.91223ec6.css} +35 -1
- package/dist/esm/data-sheet.91223ec6.css.map +1 -0
- package/dist/esm/{actions.065d098d.js → data-sheet.a3eb6088.js} +4 -4
- package/dist/esm/{actions.065d098d.js.map → data-sheet.a3eb6088.js.map} +1 -1
- package/dist/esm/{main.module.df43976f.css → data-sheet.b3ccc91b.css} +8 -5
- package/dist/esm/data-sheet.b3ccc91b.css.map +1 -0
- package/dist/esm/{provider.fefae4a0.js → data-sheet.b4098761.js} +154 -12
- package/dist/esm/data-sheet.b4098761.js.map +1 -0
- package/dist/esm/{text-areas.ccfcf204.js → data-sheet.b5946d6b.js} +6 -5
- package/dist/esm/data-sheet.b5946d6b.js.map +1 -0
- package/dist/esm/{main.module.bd60788c.js → data-sheet.d570ef95.js} +22 -22
- package/dist/esm/data-sheet.d570ef95.js.map +1 -0
- package/dist/esm/{core.f82b5af0.js → data-sheet.e09ffc66.js} +181 -80
- package/dist/esm/data-sheet.e09ffc66.js.map +1 -0
- package/dist/esm/{components.f832ecf3.js → data-sheet.e37b4bd3.js} +5 -5
- package/dist/esm/{components.f832ecf3.js.map → data-sheet.e37b4bd3.js.map} +1 -1
- package/dist/esm/data-sheet.ef63e366.css +110 -0
- package/dist/esm/data-sheet.ef63e366.css.map +1 -0
- package/dist/esm/index.d.ts +36 -23
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +3 -3
- package/dist/node/data-sheet.0f66147e.js +2 -0
- package/dist/node/data-sheet.0f66147e.js.map +1 -0
- package/dist/node/data-sheet.171105c1.js +2 -0
- package/dist/node/data-sheet.171105c1.js.map +1 -0
- package/dist/node/data-sheet.1a487c3c.js +2 -0
- package/dist/node/data-sheet.1a487c3c.js.map +1 -0
- package/dist/node/data-sheet.28641e23.css +2 -0
- package/dist/node/data-sheet.28641e23.css.map +1 -0
- package/dist/node/data-sheet.2cac1a8c.js +2 -0
- package/dist/node/data-sheet.2cac1a8c.js.map +1 -0
- package/dist/node/data-sheet.2f64274d.css +2 -0
- package/dist/node/data-sheet.2f64274d.css.map +1 -0
- package/dist/node/data-sheet.3680e59d.js +2 -0
- package/dist/node/data-sheet.3680e59d.js.map +1 -0
- package/dist/node/data-sheet.47e3f95c.js +2 -0
- package/dist/node/data-sheet.47e3f95c.js.map +1 -0
- package/dist/node/data-sheet.50d0742f.js +2 -0
- package/dist/node/data-sheet.50d0742f.js.map +1 -0
- package/dist/node/data-sheet.599efaa9.js +2 -0
- package/dist/node/data-sheet.599efaa9.js.map +1 -0
- package/dist/node/data-sheet.7b95fbc1.css +2 -0
- package/dist/node/data-sheet.7b95fbc1.css.map +1 -0
- package/dist/node/data-sheet.7bbad640.js +2 -0
- package/dist/node/data-sheet.7bbad640.js.map +1 -0
- package/dist/node/data-sheet.945becc3.js +2 -0
- package/dist/node/data-sheet.945becc3.js.map +1 -0
- package/dist/node/data-sheet.95445483.js +2 -0
- package/dist/node/data-sheet.95445483.js.map +1 -0
- package/dist/node/data-sheet.a65463ef.js +2 -0
- package/dist/node/data-sheet.a65463ef.js.map +1 -0
- package/dist/node/data-sheet.c3eefdc9.js +2 -0
- package/dist/node/data-sheet.c3eefdc9.js.map +1 -0
- package/dist/node/data-sheet.e6e07d4a.js +2 -0
- package/dist/node/data-sheet.e6e07d4a.js.map +1 -0
- package/dist/node/data-sheet.f0223f39.js +2 -0
- package/dist/node/data-sheet.f0223f39.js.map +1 -0
- package/dist/node/{actions.module.565df529.css → data-sheet.ffaf8ac7.css} +1 -1
- package/dist/node/data-sheet.ffaf8ac7.css.map +1 -0
- package/dist/node/index.js +1 -1
- package/dist/node/index.js.map +1 -1
- package/package.json +8 -6
- package/src/__archive/base.ts +1 -1
- package/src/__archive/components/column-utils.ts +1 -1
- package/src/__archive/components/index.ts +3 -3
- package/src/__archive/components/toolbar.ts +4 -4
- package/src/__archive/editors/index.ts +2 -2
- package/src/__archive/main.ts +6 -6
- package/src/__archive/provider.ts +1 -1
- package/src/__archive/test-sheet/index.ts +5 -5
- package/src/__archive/virtualized.ts +2 -2
- package/src/components/colors.ts +38 -22
- package/src/components/editor-popup.ts +28 -6
- package/src/components/main.module.sass +33 -0
- package/src/components/text-areas.ts +2 -1
- package/src/core.ts +261 -105
- package/src/main.module.sass +19 -0
- package/src/postgrest-table/data-loaders.ts +44 -12
- package/src/postgrest-table/index.ts +104 -45
- package/src/postgrest-table/main.module.sass +6 -4
- package/src/provider.ts +286 -103
- package/src/utils/column-spec.ts +42 -3
- package/dist/esm/cell-renderers.8222e82a.js +0 -31
- package/dist/esm/cell-renderers.8222e82a.js.map +0 -1
- package/dist/esm/colors.75a92ad3.js.map +0 -1
- package/dist/esm/column-spec.e56f4d75.js.map +0 -1
- package/dist/esm/core.f82b5af0.js.map +0 -1
- package/dist/esm/data-loaders.b7de291b.js.map +0 -1
- package/dist/esm/editor-popup.819ce365.js.map +0 -1
- package/dist/esm/main.module.658cf7b2.css.map +0 -1
- package/dist/esm/main.module.7e0903d4.js.map +0 -1
- package/dist/esm/main.module.83442ac4.js.map +0 -1
- package/dist/esm/main.module.b66a4bc1.css +0 -91
- package/dist/esm/main.module.b66a4bc1.css.map +0 -1
- package/dist/esm/main.module.bd60788c.js.map +0 -1
- package/dist/esm/main.module.df43976f.css.map +0 -1
- package/dist/esm/postgrest-table.d4e0260e.js.map +0 -1
- package/dist/esm/provider.fefae4a0.js.map +0 -1
- package/dist/esm/text-areas.ccfcf204.js.map +0 -1
- package/dist/node/actions.4dfe63d8.js +0 -2
- package/dist/node/actions.4dfe63d8.js.map +0 -1
- package/dist/node/actions.module.565df529.css.map +0 -1
- package/dist/node/actions.module.61991621.js +0 -2
- package/dist/node/actions.module.61991621.js.map +0 -1
- package/dist/node/cell-renderers.bbaaeb83.js +0 -2
- package/dist/node/cell-renderers.bbaaeb83.js.map +0 -1
- package/dist/node/colors.fee61100.js +0 -2
- package/dist/node/colors.fee61100.js.map +0 -1
- package/dist/node/column-spec.da7354f5.js +0 -2
- package/dist/node/column-spec.da7354f5.js.map +0 -1
- package/dist/node/components.213ca3fc.js +0 -2
- package/dist/node/components.213ca3fc.js.map +0 -1
- package/dist/node/core.c404e4d4.js +0 -2
- package/dist/node/core.c404e4d4.js.map +0 -1
- package/dist/node/data-loaders.50ce46a4.js +0 -2
- package/dist/node/data-loaders.50ce46a4.js.map +0 -1
- package/dist/node/editor-popup.e19a3668.js +0 -2
- package/dist/node/editor-popup.e19a3668.js.map +0 -1
- package/dist/node/main.module.0802fb12.js +0 -2
- package/dist/node/main.module.0802fb12.js.map +0 -1
- package/dist/node/main.module.273015bb.js +0 -2
- package/dist/node/main.module.273015bb.js.map +0 -1
- package/dist/node/main.module.4cad6bbb.js +0 -2
- package/dist/node/main.module.4cad6bbb.js.map +0 -1
- package/dist/node/main.module.8370d601.css +0 -2
- package/dist/node/main.module.8370d601.css.map +0 -1
- package/dist/node/main.module.a197ee6f.css +0 -2
- package/dist/node/main.module.a197ee6f.css.map +0 -1
- package/dist/node/main.module.e5354239.css +0 -2
- package/dist/node/main.module.e5354239.css.map +0 -1
- package/dist/node/postgrest-table.49926421.js +0 -2
- package/dist/node/postgrest-table.49926421.js.map +0 -1
- package/dist/node/provider.f11d5828.js +0 -2
- package/dist/node/provider.f11d5828.js.map +0 -1
- package/dist/node/text-areas.64832f7d.js +0 -2
- package/dist/node/text-areas.64832f7d.js.map +0 -1
- package/dist/node/utils.897d92e2.js +0 -2
- package/dist/node/utils.897d92e2.js.map +0 -1
- package/src/postgrest-table/cell-renderers.ts +0 -24
package/dist/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"mappings":"A,I,E,W,E,C,E,E,C,E,E,E,iB,A,O,I,A,C,E,S,C,E,G,K,E,O,C,C,E,C,O,C,G,K,E,C,I,E,C,C,E,A,Q,C,C,E,C,I,E,C,G,E,Q,C,C,E,O,C,C,E,C,E,E,I,C,E,O,C,E,E,O,E,E,O,A,C,I,E,A,M,uB,E,I,O,E,I,C,mB,C,C,E,Q,C,S,C,C,C,E,C,C,E,C,C,E,E,iB,C,G,
|
|
1
|
+
{"mappings":"A,M,2C,A,O,2C,C,S,E,C,C,C,E,O,O,I,C,G,O,C,S,C,E,Y,G,A,e,G,O,S,C,c,C,I,C,E,I,O,c,C,E,E,C,W,C,E,I,W,O,C,C,E,A,C,E,G,C,C,I,E,W,E,C,E,E,C,E,E,E,iB,A,O,I,A,C,E,S,C,E,G,K,E,O,C,C,E,C,O,C,G,K,E,C,I,E,C,C,E,A,Q,C,C,E,C,I,E,C,G,E,Q,C,C,E,O,C,C,E,C,E,E,I,C,E,O,C,E,E,O,E,E,O,A,C,I,E,A,M,uB,E,I,O,E,I,C,mB,C,C,E,Q,C,S,C,C,C,E,C,C,E,C,C,E,E,iB,C,G,E,Q,C,I,E,C,E,E,E,S,E,E,S,E,E,G,E,E,U,6C,gB,C,6C,S,C,4C,e,C,6C,Q,C,6C,kB,C,8D,I,C,6C,W,C,6C,S,C,6C,mB,C,6C,W,C,6C,gB,C,6C,iB,C,6C,kB,C,6C,qB,C,6C,a,C,6C,c,C,6C,Y,C,4C,iB,C,6C,mB,C,4C,sB","sources":["<anon>","packages/data-sheet/src/index.ts"],"sourcesContent":["import \"./data-sheet.c3eefdc9.js\";\nimport \"./data-sheet.0f66147e.js\";\n\n\nfunction $parcel$exportWildcard(dest, source) {\n Object.keys(source).forEach(function(key) {\n if (key === 'default' || key === '__esModule' || Object.prototype.hasOwnProperty.call(dest, key)) {\n return;\n }\n\n Object.defineProperty(dest, key, {\n enumerable: true,\n get: function get() {\n return source[key];\n }\n });\n });\n\n return dest;\n}\n\n var $parcel$global = globalThis;\n \nvar $parcel$modules = {};\nvar $parcel$inits = {};\n\nvar parcelRequire = $parcel$global[\"parcelRequirea149\"];\n\nif (parcelRequire == null) {\n parcelRequire = function(id) {\n if (id in $parcel$modules) {\n return $parcel$modules[id].exports;\n }\n if (id in $parcel$inits) {\n var init = $parcel$inits[id];\n delete $parcel$inits[id];\n var module = {id: id, exports: {}};\n $parcel$modules[id] = module;\n init.call(module.exports, module, module.exports);\n return module.exports;\n }\n var err = new Error(\"Cannot find module '\" + id + \"'\");\n err.code = 'MODULE_NOT_FOUND';\n throw err;\n };\n\n parcelRequire.register = function register(id, init) {\n $parcel$inits[id] = init;\n };\n\n $parcel$global[\"parcelRequirea149\"] = parcelRequire;\n}\n\nvar parcelRegister = parcelRequire.register;\nvar $c65828dbe869c24d$exports = {};\n\nvar $1ehpN = parcelRequire(\"1ehpN\");\n\nvar $gxLKL = parcelRequire(\"gxLKL\");\n$parcel$exportWildcard($c65828dbe869c24d$exports, $1ehpN);\n$parcel$exportWildcard($c65828dbe869c24d$exports, $gxLKL);\n\n\nexport {$963b78d65282413b$export$b556effaa3ad7d4a as DataSheetDensity, $963b78d65282413b$export$dea56b0125f0282d as DataSheet, $963b78d65282413b$export$222fa1b971ddc36 as getRowsToDelete, $963b78d65282413b$export$41ad0bbfa4755cac as BaseCell, $963b78d65282413b$export$e7db3202e96fc463 as ScrollToRowControl, $963b78d65282413b$import$5573889ca4ff9ca2$f6f0c3fe4ec306ea as Cell, $36eead336b938625$export$2a7e60c8443c1751 as EditorPopup, $827916362b958415$export$24aecfe8a925020d as ColorCell, $827916362b958415$export$e5f546a5ba915f1c as colorSwatchRenderer, $827916362b958415$export$9feb1bc2e5f1ccb3 as ColorPicker, $1b3be825da79eb57$export$b8e68c321a6269f1 as EditableTextArea, $1b3be825da79eb57$export$52c8c5a1aad17e2a as handleSpecialKeys, $4d256d31a726a84a$export$34ce2a614f5dd320 as PostgRESTTableView, $4d256d31a726a84a$export$2022c252b5885348 as wrapWithErrorHandling, $4d256d31a726a84a$export$48a1a02e95eff0a2 as notifyOnError, $4d256d31a726a84a$export$85a23c82145eafdb as LongTextViewer, $4d256d31a726a84a$export$8d4d3113a9b124d2 as IntervalCell, $4d256d31a726a84a$export$2ad73a796d2d3eb as lithologyRenderer, $4d256d31a726a84a$export$5da000845ac52c4f as ExpandedLithologies, $07d30ec9100abcaa$export$4dffb9bb65ef8b2 as usePostgRESTLazyLoader};\n//# sourceMappingURL=index.js.map\n","export * from \"./core\";\nexport * from \"./postgrest-table\";\n"],"names":["$parcel$exportWildcard","dest","source","Object","keys","forEach","key","prototype","hasOwnProperty","call","defineProperty","enumerable","get","$parcel$global","globalThis","$parcel$modules","$parcel$inits","parcelRequire","id","exports","init","module","err","Error","code","register","$c65828dbe869c24d$exports","$1ehpN","$gxLKL","$963b78d65282413b$export$b556effaa3ad7d4a","DataSheetDensity","$963b78d65282413b$export$dea56b0125f0282d","DataSheet","$963b78d65282413b$export$222fa1b971ddc36","getRowsToDelete","$963b78d65282413b$export$41ad0bbfa4755cac","BaseCell","$963b78d65282413b$export$e7db3202e96fc463","ScrollToRowControl","$963b78d65282413b$import$5573889ca4ff9ca2$f6f0c3fe4ec306ea","Cell","$36eead336b938625$export$2a7e60c8443c1751","EditorPopup","$827916362b958415$export$24aecfe8a925020d","ColorCell","$827916362b958415$export$e5f546a5ba915f1c","colorSwatchRenderer","$827916362b958415$export$9feb1bc2e5f1ccb3","ColorPicker","$1b3be825da79eb57$export$b8e68c321a6269f1","EditableTextArea","$1b3be825da79eb57$export$52c8c5a1aad17e2a","handleSpecialKeys","$4d256d31a726a84a$export$34ce2a614f5dd320","PostgRESTTableView","$4d256d31a726a84a$export$2022c252b5885348","wrapWithErrorHandling","$4d256d31a726a84a$export$48a1a02e95eff0a2","notifyOnError","$4d256d31a726a84a$export$85a23c82145eafdb","LongTextViewer","$4d256d31a726a84a$export$8d4d3113a9b124d2","IntervalCell","$4d256d31a726a84a$export$2ad73a796d2d3eb","lithologyRenderer","$4d256d31a726a84a$export$5da000845ac52c4f","ExpandedLithologies","$07d30ec9100abcaa$export$4dffb9bb65ef8b2","usePostgRESTLazyLoader"],"version":3,"file":"index.js.map","sourceRoot":"../../../../"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@macrostrat/data-sheet",
|
|
3
|
-
"version": "2.0
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "Scalable data sheet with optional editing capabilities",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"source": "src/index.ts",
|
|
@@ -30,9 +30,10 @@
|
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@blueprintjs/core": "^5.10.2",
|
|
32
32
|
"@blueprintjs/table": "^5.1.4",
|
|
33
|
-
"@macrostrat/color-utils": "^1.1.
|
|
33
|
+
"@macrostrat/color-utils": "^1.1.1",
|
|
34
|
+
"@macrostrat/data-components": "^0.2.0",
|
|
34
35
|
"@macrostrat/hyper": "^3.0.6",
|
|
35
|
-
"@macrostrat/ui-components": "^4.
|
|
36
|
+
"@macrostrat/ui-components": "^4.3.0",
|
|
36
37
|
"@supabase/postgrest-js": "^1.17.7",
|
|
37
38
|
"chroma-js": "^2.4.2",
|
|
38
39
|
"classnames": "^2.3.1",
|
|
@@ -41,7 +42,8 @@
|
|
|
41
42
|
"react-color": "^2.19.3",
|
|
42
43
|
"react-colorful": "^5.6.1",
|
|
43
44
|
"underscore": "^1.13.7",
|
|
44
|
-
"zustand": "^5.0.2"
|
|
45
|
+
"zustand": "^5.0.2",
|
|
46
|
+
"zustand-computed": "^2.1.0"
|
|
45
47
|
},
|
|
46
48
|
"files": [
|
|
47
49
|
"src",
|
|
@@ -53,7 +55,7 @@
|
|
|
53
55
|
"directory": "packages/data-sheet"
|
|
54
56
|
},
|
|
55
57
|
"devDependencies": {
|
|
56
|
-
"@types/underscore": "^1",
|
|
57
|
-
"parcel": "^2.
|
|
58
|
+
"@types/underscore": "^1.13.0",
|
|
59
|
+
"parcel": "^2.15.4"
|
|
58
60
|
}
|
|
59
61
|
}
|
package/src/__archive/base.ts
CHANGED
|
@@ -26,7 +26,7 @@ type DragItem = {
|
|
|
26
26
|
function apportionWidths(
|
|
27
27
|
columns: ColumnData[],
|
|
28
28
|
desiredWidths: { [key: string]: number },
|
|
29
|
-
containerWidth: number
|
|
29
|
+
containerWidth: number,
|
|
30
30
|
): ColumnData[] {
|
|
31
31
|
if (columns == null || desiredWidths == null || containerWidth == null)
|
|
32
32
|
return columns;
|
|
@@ -55,9 +55,9 @@ function ColumnResizeHandles() {
|
|
|
55
55
|
e.preventDefault();
|
|
56
56
|
e.stopPropagation();
|
|
57
57
|
},
|
|
58
|
-
})
|
|
58
|
+
}),
|
|
59
59
|
);
|
|
60
|
-
})
|
|
60
|
+
}),
|
|
61
61
|
);
|
|
62
62
|
}
|
|
63
63
|
|
|
@@ -80,7 +80,7 @@ function HeaderCell({ col, index }: { col: ColumnInfo; index: number }) {
|
|
|
80
80
|
return h(
|
|
81
81
|
"td.cell.header.read-only.header-cell",
|
|
82
82
|
{ style: { opacity }, key: col.name },
|
|
83
|
-
[h("div.cell-content", { ref }, col.name)]
|
|
83
|
+
[h("div.cell-content", { ref }, col.name)],
|
|
84
84
|
);
|
|
85
85
|
}
|
|
86
86
|
|
|
@@ -19,7 +19,7 @@ function SubmitDialog({
|
|
|
19
19
|
...rest,
|
|
20
20
|
onClick: () => setOpen(true),
|
|
21
21
|
},
|
|
22
|
-
"Save Changes"
|
|
22
|
+
"Save Changes",
|
|
23
23
|
),
|
|
24
24
|
h(Dialog, { isOpen: open }, [
|
|
25
25
|
h("div", { className: Classes.DIALOG_HEADER }, h("h3", null, "WARNING")),
|
|
@@ -35,7 +35,7 @@ function SubmitDialog({
|
|
|
35
35
|
setOpen(false);
|
|
36
36
|
},
|
|
37
37
|
},
|
|
38
|
-
"Save changes"
|
|
38
|
+
"Save changes",
|
|
39
39
|
),
|
|
40
40
|
h(
|
|
41
41
|
CancelButton,
|
|
@@ -43,7 +43,7 @@ function SubmitDialog({
|
|
|
43
43
|
small: true,
|
|
44
44
|
onClick: () => setOpen(false),
|
|
45
45
|
},
|
|
46
|
-
"Cancel"
|
|
46
|
+
"Cancel",
|
|
47
47
|
),
|
|
48
48
|
]),
|
|
49
49
|
]),
|
|
@@ -70,7 +70,7 @@ export function SheetToolbar(props) {
|
|
|
70
70
|
onClick: onUndo,
|
|
71
71
|
...buttonProps,
|
|
72
72
|
},
|
|
73
|
-
"Reset changes"
|
|
73
|
+
"Reset changes",
|
|
74
74
|
),
|
|
75
75
|
]),
|
|
76
76
|
h("div.spacer"),
|
|
@@ -21,7 +21,7 @@ export function BasePopupEditor(props) {
|
|
|
21
21
|
console.log(evt);
|
|
22
22
|
},
|
|
23
23
|
},
|
|
24
|
-
h(ErrorBoundary, null, children)
|
|
24
|
+
h(ErrorBoundary, null, children),
|
|
25
25
|
),
|
|
26
26
|
enforceFocus: false,
|
|
27
27
|
autoFocus: false,
|
|
@@ -36,7 +36,7 @@ export function BasePopupEditor(props) {
|
|
|
36
36
|
},
|
|
37
37
|
usePortal: false,
|
|
38
38
|
},
|
|
39
|
-
children
|
|
39
|
+
children,
|
|
40
40
|
);
|
|
41
41
|
}
|
|
42
42
|
|
package/src/__archive/main.ts
CHANGED
|
@@ -90,7 +90,7 @@ export function DataSheet(props) {
|
|
|
90
90
|
value: any,
|
|
91
91
|
row: number,
|
|
92
92
|
key: string,
|
|
93
|
-
col: number
|
|
93
|
+
col: number,
|
|
94
94
|
) => {
|
|
95
95
|
/** Need to turn off submit on click away event for cell */
|
|
96
96
|
|
|
@@ -103,7 +103,7 @@ export function DataSheet(props) {
|
|
|
103
103
|
{ edited: isChanged, "read-only": readOnly },
|
|
104
104
|
"cell",
|
|
105
105
|
"nowrap",
|
|
106
|
-
"clip"
|
|
106
|
+
"clip",
|
|
107
107
|
);
|
|
108
108
|
return {
|
|
109
109
|
value,
|
|
@@ -126,7 +126,7 @@ export function DataSheet(props) {
|
|
|
126
126
|
onSubmit,
|
|
127
127
|
onCancel,
|
|
128
128
|
hasChanges: baseData != data,
|
|
129
|
-
}
|
|
129
|
+
},
|
|
130
130
|
//h("div.right-actions", null, h(SettingsPopup))
|
|
131
131
|
);
|
|
132
132
|
|
|
@@ -154,7 +154,7 @@ function DataSheetUI({
|
|
|
154
154
|
if (finalizeCellProps != null) {
|
|
155
155
|
newData = newData.map((obj, row) => {
|
|
156
156
|
return columns.map(({ key }, col) =>
|
|
157
|
-
finalizeCellProps(obj[col].value, row, key, col)
|
|
157
|
+
finalizeCellProps(obj[col].value, row, key, col),
|
|
158
158
|
);
|
|
159
159
|
});
|
|
160
160
|
}
|
|
@@ -167,8 +167,8 @@ function DataSheetUI({
|
|
|
167
167
|
h("div.data-sheet", [
|
|
168
168
|
sheetHeader,
|
|
169
169
|
h(component, { ...rest, data: newData }),
|
|
170
|
-
])
|
|
171
|
-
)
|
|
170
|
+
]),
|
|
171
|
+
),
|
|
172
172
|
);
|
|
173
173
|
}
|
|
174
174
|
|
|
@@ -164,7 +164,7 @@ DataSheetProviderBase.defaultProps = defaultContext;
|
|
|
164
164
|
|
|
165
165
|
const DataSheetProvider = compose(
|
|
166
166
|
C(DndProvider, { backend: HTML5Backend }),
|
|
167
|
-
DataSheetProviderBase
|
|
167
|
+
DataSheetProviderBase,
|
|
168
168
|
);
|
|
169
169
|
|
|
170
170
|
const useDataSheet = () => useContext(DataSheetContext);
|
|
@@ -51,7 +51,7 @@ export const orientationFields: Field<OrientationKey>[] = [
|
|
|
51
51
|
export function addEmptyRows(
|
|
52
52
|
data: SheetContent,
|
|
53
53
|
modulus: number = 10,
|
|
54
|
-
targetN = 0
|
|
54
|
+
targetN = 0,
|
|
55
55
|
): SheetContent {
|
|
56
56
|
const nToAdd =
|
|
57
57
|
Math.ceil((data.length + targetN) / modulus) * modulus - data.length;
|
|
@@ -89,7 +89,7 @@ function Header() {
|
|
|
89
89
|
key: col.key,
|
|
90
90
|
index,
|
|
91
91
|
},
|
|
92
|
-
col.name
|
|
92
|
+
col.name,
|
|
93
93
|
);
|
|
94
94
|
}),
|
|
95
95
|
]),
|
|
@@ -124,14 +124,14 @@ function Controls({ data, updateData, resetData }) {
|
|
|
124
124
|
updateData(addEmptyRows(data, 10, 10));
|
|
125
125
|
},
|
|
126
126
|
},
|
|
127
|
-
"Add more rows"
|
|
127
|
+
"Add more rows",
|
|
128
128
|
),
|
|
129
129
|
h(
|
|
130
130
|
Button,
|
|
131
131
|
{
|
|
132
132
|
onClick: resetData,
|
|
133
133
|
},
|
|
134
|
-
"Reset data"
|
|
134
|
+
"Reset data",
|
|
135
135
|
),
|
|
136
136
|
]),
|
|
137
137
|
]);
|
|
@@ -203,7 +203,7 @@ export function DataArea({ data, updateData, resetData }) {
|
|
|
203
203
|
h(
|
|
204
204
|
ErrorBoundary,
|
|
205
205
|
null,
|
|
206
|
-
h(DataSheet, { data, updateData, style: { width: 800 } })
|
|
206
|
+
h(DataSheet, { data, updateData, style: { width: 800 } }),
|
|
207
207
|
),
|
|
208
208
|
h(Controls, { data, updateData, resetData }),
|
|
209
209
|
]);
|
|
@@ -20,7 +20,7 @@ type OptionalSelection = ReactDataSheet.Selection | null;
|
|
|
20
20
|
|
|
21
21
|
function offsetSelection(
|
|
22
22
|
sel: OptionalSelection,
|
|
23
|
-
offset: number
|
|
23
|
+
offset: number,
|
|
24
24
|
): OptionalSelection {
|
|
25
25
|
if (sel == null) return null;
|
|
26
26
|
const { start, end } = sel;
|
|
@@ -75,7 +75,7 @@ function VirtualizedSheet(props) {
|
|
|
75
75
|
},
|
|
76
76
|
h("div.scroll-panel", {
|
|
77
77
|
style: { height: scrollerHeight },
|
|
78
|
-
})
|
|
78
|
+
}),
|
|
79
79
|
);
|
|
80
80
|
}
|
|
81
81
|
|
package/src/components/colors.ts
CHANGED
|
@@ -2,48 +2,64 @@ import { Cell } from "@blueprintjs/table";
|
|
|
2
2
|
import { useInDarkMode } from "@macrostrat/ui-components";
|
|
3
3
|
import hyper from "@macrostrat/hyper";
|
|
4
4
|
import styles from "./main.module.sass";
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
asChromaColor,
|
|
7
|
+
getLuminanceAdjustedColorScheme,
|
|
8
|
+
} from "@macrostrat/color-utils";
|
|
6
9
|
import { HexColorPicker } from "react-colorful";
|
|
7
10
|
import { useEffect, useRef } from "react";
|
|
8
11
|
import { memoize } from "underscore";
|
|
12
|
+
import main from "../../../../.storybook/main";
|
|
9
13
|
|
|
10
14
|
const h = hyper.styled(styles);
|
|
11
15
|
|
|
12
|
-
export function ColorCell({
|
|
16
|
+
export function ColorCell({
|
|
17
|
+
value,
|
|
18
|
+
children,
|
|
19
|
+
style,
|
|
20
|
+
intent,
|
|
21
|
+
adjustLuminance = true,
|
|
22
|
+
...rest
|
|
23
|
+
}) {
|
|
13
24
|
const darkMode = useInDarkMode();
|
|
14
25
|
|
|
26
|
+
let mainColor = "var(--text-color)";
|
|
27
|
+
let backgroundColor = value;
|
|
28
|
+
|
|
29
|
+
if (adjustLuminance) {
|
|
30
|
+
// If adjustLuminance is true, get the color scheme based on the value
|
|
31
|
+
let colors = colorCombo(value, darkMode, 0.05);
|
|
32
|
+
if (colors != null) {
|
|
33
|
+
mainColor = colors.mainColor;
|
|
34
|
+
backgroundColor = colors.backgroundColor;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
15
38
|
return h(
|
|
16
39
|
Cell,
|
|
17
40
|
{
|
|
18
41
|
...rest,
|
|
19
42
|
style: {
|
|
43
|
+
color: mainColor,
|
|
44
|
+
backgroundColor,
|
|
20
45
|
...style,
|
|
21
|
-
...colorCombo(value, darkMode),
|
|
22
46
|
},
|
|
23
47
|
},
|
|
24
|
-
children
|
|
48
|
+
children,
|
|
25
49
|
);
|
|
26
50
|
}
|
|
27
51
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
) {
|
|
36
|
-
const brighten = luminance ?? darkMode ? 0.5 : 0.1;
|
|
37
|
-
|
|
38
|
-
// Check if is a chroma color
|
|
39
|
-
color = asChromaColor(color);
|
|
40
|
-
if (color == null) return {};
|
|
41
|
-
return {
|
|
42
|
-
color: color?.luminance?.(brighten).css(),
|
|
43
|
-
backgroundColor: color?.alpha?.(backgroundAlpha).css(),
|
|
44
|
-
};
|
|
52
|
+
export function colorSwatchRenderer(value) {
|
|
53
|
+
return h("span.color-swatch-container", [
|
|
54
|
+
h("span.color-swatch", {
|
|
55
|
+
style: { backgroundColor: value },
|
|
56
|
+
}),
|
|
57
|
+
h("span.color-name", value),
|
|
58
|
+
]);
|
|
45
59
|
}
|
|
46
60
|
|
|
61
|
+
const colorCombo = memoize(getLuminanceAdjustedColorScheme);
|
|
62
|
+
|
|
47
63
|
enum ColorConversionType {
|
|
48
64
|
HEX = "hex",
|
|
49
65
|
RGB = "rgb",
|
|
@@ -85,6 +101,6 @@ export function ColorPicker({
|
|
|
85
101
|
onChange(color) {
|
|
86
102
|
onChange(asChromaColor(color)[type]());
|
|
87
103
|
},
|
|
88
|
-
})
|
|
104
|
+
}),
|
|
89
105
|
);
|
|
90
106
|
}
|
|
@@ -13,13 +13,34 @@ export function EditorPopup(props) {
|
|
|
13
13
|
targetClassName,
|
|
14
14
|
autoFocus,
|
|
15
15
|
valueViewer,
|
|
16
|
-
inlineEditor,
|
|
16
|
+
//inlineEditor,
|
|
17
17
|
} = props;
|
|
18
18
|
|
|
19
19
|
const [isOpen, setIsOpen] = useState(autoFocus);
|
|
20
20
|
|
|
21
21
|
const ref = useRef(null);
|
|
22
22
|
|
|
23
|
+
const inlineEditor = h([
|
|
24
|
+
h("span.editor-value.bp5-table-cell", valueViewer),
|
|
25
|
+
h("input.hidden-editor", {
|
|
26
|
+
value: "",
|
|
27
|
+
autoFocus: true,
|
|
28
|
+
onKeyDown(e) {
|
|
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
|
+
},
|
|
41
|
+
}),
|
|
42
|
+
]);
|
|
43
|
+
|
|
23
44
|
return h(
|
|
24
45
|
Popover,
|
|
25
46
|
{
|
|
@@ -33,12 +54,13 @@ export function EditorPopup(props) {
|
|
|
33
54
|
if (evt.key === "Escape") {
|
|
34
55
|
setIsOpen(false);
|
|
35
56
|
evt.preventDefault();
|
|
57
|
+
evt.stopPropagation();
|
|
36
58
|
}
|
|
37
59
|
// Climb over the interaction barrier to propagate the key event to the table
|
|
38
|
-
ref.current.dispatchEvent(new KeyboardEvent("keydown", evt));
|
|
60
|
+
//ref.current.dispatchEvent(new KeyboardEvent("keydown", evt));
|
|
39
61
|
},
|
|
40
62
|
},
|
|
41
|
-
h(ErrorBoundary, null, content)
|
|
63
|
+
h(ErrorBoundary, null, content),
|
|
42
64
|
),
|
|
43
65
|
enforceFocus: false,
|
|
44
66
|
autoFocus: false,
|
|
@@ -56,14 +78,14 @@ export function EditorPopup(props) {
|
|
|
56
78
|
usePortal: true,
|
|
57
79
|
},
|
|
58
80
|
h(
|
|
59
|
-
"span.editor-popup-target",
|
|
81
|
+
"span.editor-popup-target.bp5-table-cell",
|
|
60
82
|
{
|
|
61
83
|
className: targetClassName,
|
|
62
84
|
onClick: () => setIsOpen(!isOpen),
|
|
63
85
|
ref,
|
|
64
86
|
},
|
|
65
87
|
// If the editor is open, show the inline editor, otherwise show the value viewer
|
|
66
|
-
isOpen ? valueViewer : inlineEditor ?? valueViewer
|
|
67
|
-
)
|
|
88
|
+
isOpen ? valueViewer : (inlineEditor ?? valueViewer),
|
|
89
|
+
),
|
|
68
90
|
);
|
|
69
91
|
}
|
|
@@ -24,6 +24,17 @@
|
|
|
24
24
|
right: 0.2em
|
|
25
25
|
transform: scale(0.8)
|
|
26
26
|
|
|
27
|
+
.hidden-editor
|
|
28
|
+
opacity: 0
|
|
29
|
+
|
|
30
|
+
.editor-value
|
|
31
|
+
position: absolute
|
|
32
|
+
top: 0
|
|
33
|
+
left: 0
|
|
34
|
+
width: 100%
|
|
35
|
+
height: 100%
|
|
36
|
+
|
|
37
|
+
|
|
27
38
|
// Color picker
|
|
28
39
|
.color-picker-container
|
|
29
40
|
:global
|
|
@@ -33,3 +44,25 @@
|
|
|
33
44
|
.react-colorful__hue
|
|
34
45
|
border-radius: 0
|
|
35
46
|
|
|
47
|
+
|
|
48
|
+
.color-swatch
|
|
49
|
+
width: 18px
|
|
50
|
+
height: 18px
|
|
51
|
+
display: inline-block
|
|
52
|
+
margin-right: 0.5em
|
|
53
|
+
|
|
54
|
+
.color-swatch-container
|
|
55
|
+
position: absolute
|
|
56
|
+
top: 0
|
|
57
|
+
left: 0
|
|
58
|
+
right: 0
|
|
59
|
+
bottom: 0
|
|
60
|
+
display: flex
|
|
61
|
+
flex-direction: row
|
|
62
|
+
align-items: center
|
|
63
|
+
gap: 0.3em
|
|
64
|
+
|
|
65
|
+
.color-name
|
|
66
|
+
position: relative
|
|
67
|
+
flex-grow: 1
|
|
68
|
+
display: block
|