@deck.gl-community/graph-layers 9.1.1 → 9.2.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/_deprecated/old-constants.d.ts +107 -0
- package/dist/_deprecated/old-constants.d.ts.map +1 -0
- package/dist/_deprecated/old-constants.js +111 -0
- package/dist/_deprecated/old-constants.js.map +1 -0
- package/dist/core/cache.d.ts +0 -1
- package/dist/core/cache.js +0 -1
- package/dist/core/constants.d.ts +12 -100
- package/dist/core/constants.d.ts.map +1 -1
- package/dist/core/constants.js +3 -44
- package/dist/core/constants.js.map +1 -1
- package/dist/core/graph-engine.d.ts +63 -20
- package/dist/core/graph-engine.d.ts.map +1 -1
- package/dist/core/graph-engine.js +163 -72
- package/dist/core/graph-engine.js.map +1 -1
- package/dist/core/graph-layout.d.ts +63 -32
- package/dist/core/graph-layout.d.ts.map +1 -1
- package/dist/core/graph-layout.js +118 -36
- package/dist/core/graph-layout.js.map +1 -1
- package/dist/core/interaction-manager.d.ts +7 -5
- package/dist/core/interaction-manager.d.ts.map +1 -1
- package/dist/core/interaction-manager.js +64 -20
- package/dist/core/interaction-manager.js.map +1 -1
- package/dist/graph/arrow-graph.d.ts +69 -0
- package/dist/graph/arrow-graph.d.ts.map +1 -0
- package/dist/graph/arrow-graph.js +513 -0
- package/dist/graph/arrow-graph.js.map +1 -0
- package/dist/graph/classic-graph.d.ts +169 -0
- package/dist/graph/classic-graph.d.ts.map +1 -0
- package/dist/graph/classic-graph.js +390 -0
- package/dist/graph/classic-graph.js.map +1 -0
- package/dist/graph/edge.d.ts +12 -12
- package/dist/graph/edge.d.ts.map +1 -1
- package/dist/graph/edge.js +3 -6
- package/dist/graph/edge.js.map +1 -1
- package/dist/graph/functions/arrow-utils.d.ts +6 -0
- package/dist/graph/functions/arrow-utils.d.ts.map +1 -0
- package/dist/graph/functions/arrow-utils.js +67 -0
- package/dist/graph/functions/arrow-utils.js.map +1 -0
- package/dist/graph/functions/create-graph-from-data.d.ts +3 -0
- package/dist/graph/functions/create-graph-from-data.d.ts.map +1 -0
- package/dist/graph/functions/create-graph-from-data.js +12 -0
- package/dist/graph/functions/create-graph-from-data.js.map +1 -0
- package/dist/graph/graph-normalization.d.ts +10 -0
- package/dist/graph/graph-normalization.d.ts.map +1 -0
- package/dist/graph/graph-normalization.js +65 -0
- package/dist/graph/graph-normalization.js.map +1 -0
- package/dist/graph/graph.d.ts +62 -156
- package/dist/graph/graph.d.ts.map +1 -1
- package/dist/graph/graph.js +11 -301
- package/dist/graph/graph.js.map +1 -1
- package/dist/graph/node.d.ts +12 -13
- package/dist/graph/node.d.ts.map +1 -1
- package/dist/graph/node.js +5 -7
- package/dist/graph/node.js.map +1 -1
- package/dist/graph-data/arrow-graph-data-builder.d.ts +21 -0
- package/dist/graph-data/arrow-graph-data-builder.d.ts.map +1 -0
- package/dist/graph-data/arrow-graph-data-builder.js +105 -0
- package/dist/graph-data/arrow-graph-data-builder.js.map +1 -0
- package/dist/graph-data/graph-data-builder.d.ts +6 -0
- package/dist/graph-data/graph-data-builder.d.ts.map +1 -0
- package/dist/graph-data/graph-data-builder.js +1 -0
- package/dist/graph-data/graph-data-builder.js.map +1 -0
- package/dist/graph-data/graph-data.d.ts +40 -0
- package/dist/graph-data/graph-data.d.ts.map +1 -0
- package/dist/graph-data/graph-data.js +11 -0
- package/dist/graph-data/graph-data.js.map +1 -0
- package/dist/graph-data/plain-graph-data-builder.d.ts +20 -0
- package/dist/graph-data/plain-graph-data-builder.d.ts.map +1 -0
- package/dist/graph-data/plain-graph-data-builder.js +105 -0
- package/dist/graph-data/plain-graph-data-builder.js.map +1 -0
- package/dist/graph-style-schema.cdn.d.ts +2 -0
- package/dist/graph-style-schema.cdn.js +2 -0
- package/dist/graph-style-schema.json +12 -0
- package/dist/index.cjs +7851 -3250
- package/dist/index.cjs.map +4 -4
- package/dist/index.d.ts +35 -22
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +42 -25
- package/dist/index.js.map +1 -1
- package/dist/layers/common-layers/flow-path-layer/flow-path-layer-fragment.glsl.d.ts +0 -1
- package/dist/layers/common-layers/flow-path-layer/flow-path-layer-fragment.glsl.js +0 -1
- package/dist/layers/common-layers/flow-path-layer/flow-path-layer-vertex-tf.glsl.d.ts +0 -1
- package/dist/layers/common-layers/flow-path-layer/flow-path-layer-vertex-tf.glsl.js +0 -1
- package/dist/layers/common-layers/flow-path-layer/flow-path-layer-vertex.glsl.d.ts +0 -1
- package/dist/layers/common-layers/flow-path-layer/flow-path-layer-vertex.glsl.js +0 -1
- package/dist/layers/common-layers/flow-path-layer/flow-path-layer.d.ts +0 -1
- package/dist/layers/common-layers/flow-path-layer/flow-path-layer.d.ts.map +1 -1
- package/dist/layers/common-layers/flow-path-layer/flow-path-layer.js +1 -3
- package/dist/layers/common-layers/flow-path-layer/flow-path-layer.js.map +1 -1
- package/dist/layers/common-layers/grid-layer/grid-layer.d.ts +83 -0
- package/dist/layers/common-layers/grid-layer/grid-layer.d.ts.map +1 -0
- package/dist/layers/common-layers/grid-layer/grid-layer.js +133 -0
- package/dist/layers/common-layers/grid-layer/grid-layer.js.map +1 -0
- package/dist/layers/common-layers/marker-layer/atlas-data-url.d.ts +0 -1
- package/dist/layers/common-layers/marker-layer/atlas-data-url.js +0 -1
- package/dist/layers/common-layers/marker-layer/marker-layer.d.ts +0 -1
- package/dist/layers/common-layers/marker-layer/marker-layer.js +2 -3
- package/dist/layers/common-layers/marker-layer/marker-list.d.ts +2 -63
- package/dist/layers/common-layers/marker-layer/marker-list.d.ts.map +1 -1
- package/dist/layers/common-layers/marker-layer/marker-list.js +1 -65
- package/dist/layers/common-layers/marker-layer/marker-list.js.map +1 -1
- package/dist/layers/common-layers/marker-layer/marker-mapping.d.ts +0 -1
- package/dist/layers/common-layers/marker-layer/marker-mapping.js +0 -1
- package/dist/layers/common-layers/spline-layer/spline-layer.d.ts +0 -1
- package/dist/layers/common-layers/spline-layer/spline-layer.js +0 -1
- package/dist/layers/common-layers/zoomable-text-layer/zoomable-text-layer.d.ts +0 -1
- package/dist/layers/common-layers/zoomable-text-layer/zoomable-text-layer.js +0 -1
- package/dist/layers/edge-attachment-helper.d.ts +15 -0
- package/dist/layers/edge-attachment-helper.d.ts.map +1 -0
- package/dist/layers/edge-attachment-helper.js +229 -0
- package/dist/layers/edge-attachment-helper.js.map +1 -0
- package/dist/layers/edge-layer.d.ts +1 -5
- package/dist/layers/edge-layer.d.ts.map +1 -1
- package/dist/layers/edge-layer.js +9 -11
- package/dist/layers/edge-layer.js.map +1 -1
- package/dist/layers/edge-layers/arrow-2d-geometry.d.ts +4 -0
- package/dist/layers/edge-layers/arrow-2d-geometry.d.ts.map +1 -0
- package/dist/layers/edge-layers/arrow-2d-geometry.js +42 -0
- package/dist/layers/edge-layers/arrow-2d-geometry.js.map +1 -0
- package/dist/layers/edge-layers/curved-edge-layer.d.ts +1 -2
- package/dist/layers/edge-layers/curved-edge-layer.js +1 -2
- package/dist/layers/edge-layers/edge-arrow-layer.d.ts +21 -0
- package/dist/layers/edge-layers/edge-arrow-layer.d.ts.map +1 -0
- package/dist/layers/edge-layers/edge-arrow-layer.js +131 -0
- package/dist/layers/edge-layers/edge-arrow-layer.js.map +1 -0
- package/dist/layers/edge-layers/edge-label-layer.d.ts +1 -2
- package/dist/layers/edge-layers/edge-label-layer.js +1 -2
- package/dist/layers/edge-layers/flow-layer.d.ts +1 -2
- package/dist/layers/edge-layers/flow-layer.js +1 -2
- package/dist/layers/edge-layers/path-edge-layer.d.ts +0 -1
- package/dist/layers/edge-layers/path-edge-layer.js +0 -1
- package/dist/layers/edge-layers/straight-line-edge-layer.d.ts +0 -1
- package/dist/layers/edge-layers/straight-line-edge-layer.js +0 -1
- package/dist/layers/graph-layer.d.ts +85 -29
- package/dist/layers/graph-layer.d.ts.map +1 -1
- package/dist/layers/graph-layer.js +635 -94
- package/dist/layers/graph-layer.js.map +1 -1
- package/dist/layers/node-layers/circle-layer.d.ts +0 -1
- package/dist/layers/node-layers/circle-layer.js +0 -1
- package/dist/layers/node-layers/image-layer.d.ts +0 -1
- package/dist/layers/node-layers/image-layer.js +0 -1
- package/dist/layers/node-layers/label-layer.d.ts +1 -2
- package/dist/layers/node-layers/label-layer.js +1 -2
- package/dist/layers/node-layers/path-rounded-rectangle-layer.d.ts +0 -1
- package/dist/layers/node-layers/path-rounded-rectangle-layer.js +1 -2
- package/dist/layers/node-layers/rectangle-layer.d.ts +0 -1
- package/dist/layers/node-layers/rectangle-layer.js +0 -1
- package/dist/layers/node-layers/rounded-rectangle-layer-fragment.d.ts +0 -1
- package/dist/layers/node-layers/rounded-rectangle-layer-fragment.js +0 -1
- package/dist/layers/node-layers/rounded-rectangle-layer.d.ts +1 -2
- package/dist/layers/node-layers/rounded-rectangle-layer.js +2 -3
- package/dist/layers/node-layers/zoomable-marker-layer.d.ts +1 -2
- package/dist/layers/node-layers/zoomable-marker-layer.js +1 -2
- package/dist/layouts/d3-dag/collapsable-d3-dag-layout.d.ts +24 -0
- package/dist/layouts/d3-dag/collapsable-d3-dag-layout.d.ts.map +1 -0
- package/dist/layouts/d3-dag/collapsable-d3-dag-layout.js +251 -0
- package/dist/layouts/d3-dag/collapsable-d3-dag-layout.js.map +1 -0
- package/dist/layouts/d3-dag/d3-dag-layout.d.ts +102 -0
- package/dist/layouts/d3-dag/d3-dag-layout.d.ts.map +1 -0
- package/dist/layouts/d3-dag/d3-dag-layout.js +531 -0
- package/dist/layouts/d3-dag/d3-dag-layout.js.map +1 -0
- package/dist/layouts/d3-force/d3-force-layout.d.ts +23 -11
- package/dist/layouts/d3-force/d3-force-layout.d.ts.map +1 -1
- package/dist/layouts/d3-force/d3-force-layout.js +63 -29
- package/dist/layouts/d3-force/d3-force-layout.js.map +1 -1
- package/dist/layouts/d3-force/worker.d.ts +0 -1
- package/dist/layouts/d3-force/worker.js +0 -1
- package/dist/layouts/experimental/force-multi-graph-layout.d.ts +25 -20
- package/dist/layouts/experimental/force-multi-graph-layout.d.ts.map +1 -1
- package/dist/layouts/experimental/force-multi-graph-layout.js +60 -47
- package/dist/layouts/experimental/force-multi-graph-layout.js.map +1 -1
- package/dist/layouts/experimental/hive-plot-layout.d.ts +26 -20
- package/dist/layouts/experimental/hive-plot-layout.d.ts.map +1 -1
- package/dist/layouts/experimental/hive-plot-layout.js +43 -39
- package/dist/layouts/experimental/hive-plot-layout.js.map +1 -1
- package/dist/layouts/experimental/radial-layout.d.ts +20 -12
- package/dist/layouts/experimental/radial-layout.d.ts.map +1 -1
- package/dist/layouts/experimental/radial-layout.js +41 -19
- package/dist/layouts/experimental/radial-layout.js.map +1 -1
- package/dist/layouts/gpu-force/gpu-force-layout.d.ts +15 -12
- package/dist/layouts/gpu-force/gpu-force-layout.d.ts.map +1 -1
- package/dist/layouts/gpu-force/gpu-force-layout.js +71 -59
- package/dist/layouts/gpu-force/gpu-force-layout.js.map +1 -1
- package/dist/layouts/gpu-force/worker.d.ts +0 -1
- package/dist/layouts/gpu-force/worker.js +0 -1
- package/dist/layouts/simple-layout.d.ts +21 -31
- package/dist/layouts/simple-layout.d.ts.map +1 -1
- package/dist/layouts/simple-layout.js +33 -26
- package/dist/layouts/simple-layout.js.map +1 -1
- package/dist/loaders/dot-graph-loader.d.ts +25 -0
- package/dist/loaders/dot-graph-loader.d.ts.map +1 -0
- package/dist/loaders/dot-graph-loader.js +668 -0
- package/dist/loaders/dot-graph-loader.js.map +1 -0
- package/dist/loaders/json-graph-loader.d.ts +6 -0
- package/dist/loaders/json-graph-loader.d.ts.map +1 -0
- package/dist/loaders/json-graph-loader.js +31 -0
- package/dist/loaders/json-graph-loader.js.map +1 -0
- package/dist/loaders/parsers/edge-parsers.d.ts +2 -0
- package/dist/loaders/parsers/edge-parsers.d.ts.map +1 -0
- package/dist/loaders/{edge-parsers.js → parsers/edge-parsers.js} +2 -3
- package/dist/loaders/parsers/edge-parsers.js.map +1 -0
- package/dist/loaders/parsers/node-parsers.d.ts +2 -0
- package/dist/loaders/parsers/node-parsers.d.ts.map +1 -0
- package/dist/loaders/{node-parsers.js → parsers/node-parsers.js} +2 -3
- package/dist/loaders/parsers/node-parsers.js.map +1 -0
- package/dist/loaders/parsers/parse-json-graph.d.ts +29 -0
- package/dist/loaders/parsers/parse-json-graph.d.ts.map +1 -0
- package/dist/loaders/parsers/parse-json-graph.js +78 -0
- package/dist/loaders/parsers/parse-json-graph.js.map +1 -0
- package/dist/style/graph-layer-stylesheet.d.ts +34 -0
- package/dist/style/graph-layer-stylesheet.d.ts.map +1 -0
- package/dist/style/graph-layer-stylesheet.js +39 -0
- package/dist/style/graph-layer-stylesheet.js.map +1 -0
- package/dist/style/graph-style-accessor-map.d.ts +93 -0
- package/dist/style/graph-style-accessor-map.d.ts.map +1 -0
- package/dist/style/graph-style-accessor-map.js +93 -0
- package/dist/style/graph-style-accessor-map.js.map +1 -0
- package/dist/style/graph-style-engine.d.ts +12 -0
- package/dist/style/graph-style-engine.d.ts.map +1 -0
- package/dist/style/graph-style-engine.js +164 -0
- package/dist/style/graph-style-engine.js.map +1 -0
- package/dist/style/graph-stylesheet.schema.d.ts +310 -0
- package/dist/style/graph-stylesheet.schema.d.ts.map +1 -0
- package/dist/style/graph-stylesheet.schema.js +237 -0
- package/dist/style/graph-stylesheet.schema.js.map +1 -0
- package/dist/style/style-property.d.ts +2 -3
- package/dist/style/style-property.d.ts.map +1 -1
- package/dist/style/style-property.js +224 -48
- package/dist/style/style-property.js.map +1 -1
- package/dist/style/stylesheet-engine.d.ts +33 -0
- package/dist/style/stylesheet-engine.d.ts.map +1 -0
- package/dist/style/stylesheet-engine.js +121 -0
- package/dist/style/stylesheet-engine.js.map +1 -0
- package/dist/utils/collapsed-chains.d.ts +17 -0
- package/dist/utils/collapsed-chains.d.ts.map +1 -0
- package/dist/utils/collapsed-chains.js +192 -0
- package/dist/utils/collapsed-chains.js.map +1 -0
- package/dist/utils/layer-utils.d.ts +0 -1
- package/dist/utils/layer-utils.d.ts.map +1 -1
- package/dist/utils/layer-utils.js +0 -1
- package/dist/utils/log.d.ts +2 -1
- package/dist/utils/log.d.ts.map +1 -1
- package/dist/utils/log.js +12 -2
- package/dist/utils/log.js.map +1 -1
- package/dist/utils/node-boundary.d.ts +10 -0
- package/dist/utils/node-boundary.d.ts.map +1 -0
- package/dist/utils/node-boundary.js +130 -0
- package/dist/utils/node-boundary.js.map +1 -0
- package/dist/utils/polygon-calculations.d.ts +0 -1
- package/dist/utils/polygon-calculations.js +0 -1
- package/dist/utils/rank-grid.d.ts +30 -0
- package/dist/utils/rank-grid.d.ts.map +1 -0
- package/dist/utils/rank-grid.js +306 -0
- package/dist/utils/rank-grid.js.map +1 -0
- package/package.json +25 -13
- package/src/_deprecated/old-constants.ts +122 -0
- package/src/_disabled/arrow-graph-data.ts.disabled +18 -0
- package/src/_disabled/columnar-graph-data-builder.ts.disabled +250 -0
- package/src/_disabled/graph-runtime-layout.ts.disabled +29 -0
- package/src/core/constants.ts +21 -43
- package/src/core/graph-engine.ts +212 -80
- package/src/core/graph-layout.ts +175 -47
- package/src/core/interaction-manager.ts +93 -33
- package/src/graph/arrow-graph.ts +648 -0
- package/src/graph/classic-graph.ts +447 -0
- package/src/graph/edge.ts +13 -13
- package/src/graph/functions/arrow-utils.ts +72 -0
- package/src/graph/functions/convert-arrow-graph-to-classic-graph.ts.disabled +47 -0
- package/src/graph/functions/convert-plain-graph-to-arrow-graph.ts.disabled +119 -0
- package/src/graph/functions/create-graph-from-data.ts +16 -0
- package/src/graph/functions/create-plain-graph-from-data.ts.disabled +176 -0
- package/src/graph/graph-normalization.ts +87 -0
- package/src/graph/graph.ts +68 -339
- package/src/graph/node.ts +15 -15
- package/src/graph/tabular-graph.ts.disabled +761 -0
- package/src/graph-data/arrow-graph-data-builder.ts +165 -0
- package/src/graph-data/graph-data-builder.ts +7 -0
- package/src/graph-data/graph-data.ts +57 -0
- package/src/graph-data/plain-graph-data-builder.ts +132 -0
- package/src/index.ts +82 -17
- package/src/layers/common-layers/flow-path-layer/flow-path-layer.ts +1 -2
- package/src/layers/common-layers/grid-layer/grid-layer.ts +237 -0
- package/src/layers/common-layers/marker-layer/marker-list.ts +62 -64
- package/src/layers/edge-attachment-helper.ts +361 -0
- package/src/layers/edge-layer.ts +6 -7
- package/src/layers/edge-layers/arrow-2d-geometry.ts +51 -0
- package/src/layers/edge-layers/edge-arrow-layer.ts +171 -0
- package/src/layers/graph-layer.ts +928 -130
- package/src/layouts/d3-dag/collapsable-d3-dag-layout.ts +330 -0
- package/src/layouts/d3-dag/d3-dag-layout.ts +739 -0
- package/src/layouts/d3-force/d3-force-layout.ts +83 -39
- package/src/layouts/experimental/force-multi-graph-layout.ts +72 -57
- package/src/layouts/experimental/hive-plot-layout.ts +60 -49
- package/src/layouts/experimental/radial-layout.ts +57 -26
- package/src/layouts/gpu-force/gpu-force-layout.ts +86 -72
- package/src/layouts/simple-layout.ts +51 -52
- package/src/loaders/{create-graph.ts → deprecated/create-graph.ts.disabled} +6 -6
- package/src/loaders/deprecated/json-classic-graph-loader.ts.disabled +33 -0
- package/src/loaders/{simple-json-graph-loader.ts → deprecated/simple-json-graph-loader.ts.disabled} +4 -4
- package/src/loaders/{table-graph-loader.ts → deprecated/table-graph-loader.ts.disabled} +9 -9
- package/src/loaders/dot-graph-loader.ts +860 -0
- package/src/loaders/json-graph-loader.ts +48 -0
- package/src/loaders/parsers/create-graph-data.ts.disabled +45 -0
- package/src/loaders/{edge-parsers.ts → parsers/edge-parsers.ts} +3 -3
- package/src/loaders/{node-parsers.ts → parsers/node-parsers.ts} +3 -3
- package/src/loaders/parsers/parse-json-graph.ts +134 -0
- package/src/style/graph-layer-stylesheet.ts +99 -0
- package/src/style/graph-style-accessor-map.ts +103 -0
- package/src/style/graph-style-engine.ts +232 -0
- package/src/style/graph-stylesheet.schema.ts +344 -0
- package/src/style/style-property.ts +314 -51
- package/src/style/stylesheet-engine.ts +168 -0
- package/src/utils/collapsed-chains.ts +255 -0
- package/src/utils/log.ts +15 -1
- package/src/utils/node-boundary.ts +238 -0
- package/src/utils/rank-grid.ts +426 -0
- package/dist/loaders/create-graph.d.ts +0 -13
- package/dist/loaders/create-graph.d.ts.map +0 -1
- package/dist/loaders/create-graph.js +0 -39
- package/dist/loaders/create-graph.js.map +0 -1
- package/dist/loaders/edge-parsers.d.ts +0 -3
- package/dist/loaders/edge-parsers.d.ts.map +0 -1
- package/dist/loaders/edge-parsers.js.map +0 -1
- package/dist/loaders/json-loader.d.ts +0 -8
- package/dist/loaders/json-loader.d.ts.map +0 -1
- package/dist/loaders/json-loader.js +0 -17
- package/dist/loaders/json-loader.js.map +0 -1
- package/dist/loaders/node-parsers.d.ts +0 -3
- package/dist/loaders/node-parsers.d.ts.map +0 -1
- package/dist/loaders/node-parsers.js.map +0 -1
- package/dist/loaders/simple-json-graph-loader.d.ts +0 -12
- package/dist/loaders/simple-json-graph-loader.d.ts.map +0 -1
- package/dist/loaders/simple-json-graph-loader.js +0 -21
- package/dist/loaders/simple-json-graph-loader.js.map +0 -1
- package/dist/loaders/table-graph-loader.d.ts +0 -17
- package/dist/loaders/table-graph-loader.d.ts.map +0 -1
- package/dist/loaders/table-graph-loader.js +0 -92
- package/dist/loaders/table-graph-loader.js.map +0 -1
- package/dist/style/style-sheet.d.ts +0 -11
- package/dist/style/style-sheet.d.ts.map +0 -1
- package/dist/style/style-sheet.js +0 -253
- package/dist/style/style-sheet.js.map +0 -1
- package/dist/widgets/long-press-button.d.ts +0 -13
- package/dist/widgets/long-press-button.d.ts.map +0 -1
- package/dist/widgets/long-press-button.js +0 -32
- package/dist/widgets/long-press-button.js.map +0 -1
- package/dist/widgets/view-control-widget.d.ts +0 -78
- package/dist/widgets/view-control-widget.d.ts.map +0 -1
- package/dist/widgets/view-control-widget.js +0 -195
- package/dist/widgets/view-control-widget.js.map +0 -1
- package/src/loaders/json-loader.ts +0 -19
- package/src/style/style-sheet.ts +0 -277
- package/src/widgets/long-press-button.tsx +0 -50
- package/src/widgets/view-control-widget.tsx +0 -337
|
@@ -1,195 +0,0 @@
|
|
|
1
|
-
import { jsxs as _jsxs, jsx as _jsx } from "preact/jsx-runtime";
|
|
2
|
-
// deck.gl-community
|
|
3
|
-
// SPDX-License-Identifier: MIT
|
|
4
|
-
// Copyright (c) vis.gl contributors
|
|
5
|
-
import { Component, render } from 'preact';
|
|
6
|
-
import { LongPressButton } from "./long-press-button.js";
|
|
7
|
-
export const ViewControlWrapper = ({ children }) => (_jsxs("div", { style: {
|
|
8
|
-
alignItems: 'center',
|
|
9
|
-
display: 'flex',
|
|
10
|
-
flexDirection: 'column',
|
|
11
|
-
position: 'absolute',
|
|
12
|
-
zIndex: 99,
|
|
13
|
-
userSelect: 'none'
|
|
14
|
-
}, children: [' ', children, ' '] }));
|
|
15
|
-
export const NavigationButtonContainer = ({ children }) => (_jsxs("div", { style: {
|
|
16
|
-
background: '#f7f7f7',
|
|
17
|
-
borderRadius: '23px',
|
|
18
|
-
border: '0.5px solid #eaeaea',
|
|
19
|
-
boxShadow: 'inset 11px 11px 5px -7px rgba(230, 230, 230, 0.49)',
|
|
20
|
-
height: '46px',
|
|
21
|
-
width: '46px'
|
|
22
|
-
}, children: [' ', children, ' '] }));
|
|
23
|
-
export const NavigationButton = (props) => (_jsxs("div", { onClick: props.onClick, style: {
|
|
24
|
-
color: '#848484',
|
|
25
|
-
cursor: 'pointer',
|
|
26
|
-
position: 'absolute',
|
|
27
|
-
left: props.left,
|
|
28
|
-
top: props.top,
|
|
29
|
-
transform: `rotate(${props.rotate || 0}deg)`
|
|
30
|
-
// &:hover,
|
|
31
|
-
// &:active {
|
|
32
|
-
// color: #00ade6;
|
|
33
|
-
// }
|
|
34
|
-
}, children: [' ', props.children, ' '] }));
|
|
35
|
-
export const ZoomControlWrapper = ({ children }) => (_jsxs("div", { style: {
|
|
36
|
-
alignItems: 'center',
|
|
37
|
-
background: '#f7f7f7',
|
|
38
|
-
border: '0.5px solid #eaeaea',
|
|
39
|
-
display: 'flex',
|
|
40
|
-
flexDirection: 'column',
|
|
41
|
-
marginTop: '6px',
|
|
42
|
-
padding: '2px 0',
|
|
43
|
-
width: '18px'
|
|
44
|
-
}, children: [' ', children, ' '] }));
|
|
45
|
-
export const VerticalSlider = ({ children }) => (_jsxs("div", { style: {
|
|
46
|
-
display: 'inline-block',
|
|
47
|
-
height: '100px',
|
|
48
|
-
padding: '0',
|
|
49
|
-
width: '10px'
|
|
50
|
-
// > input[type='range'][orient='vertical'] {
|
|
51
|
-
// -webkit-appearance: slider-vertical;
|
|
52
|
-
// height: 100px;
|
|
53
|
-
// padding: 0;
|
|
54
|
-
// margin: 0;
|
|
55
|
-
// width: 10px;
|
|
56
|
-
// }
|
|
57
|
-
}, children: [' ', children, ' '] }));
|
|
58
|
-
export const ZoomControlButton = ({ children }) => (_jsxs("div", { style: {
|
|
59
|
-
cursor: 'pointer',
|
|
60
|
-
fontSize: '14px',
|
|
61
|
-
fontWeight: 500,
|
|
62
|
-
margin: '-4px'
|
|
63
|
-
// &:hover,
|
|
64
|
-
// &:active {
|
|
65
|
-
// color: #00ade6;
|
|
66
|
-
// }
|
|
67
|
-
}, children: [' ', children, ' '] }));
|
|
68
|
-
export class ViewControl extends Component {
|
|
69
|
-
static displayName = 'ViewControl';
|
|
70
|
-
static defaultProps = {
|
|
71
|
-
id: undefined,
|
|
72
|
-
viewId: undefined,
|
|
73
|
-
placement: 'top-left',
|
|
74
|
-
fitBounds: () => { },
|
|
75
|
-
panBy: () => { },
|
|
76
|
-
zoomBy: () => { },
|
|
77
|
-
zoomLevel: 1,
|
|
78
|
-
deltaPan: 10,
|
|
79
|
-
deltaZoom: 0.1,
|
|
80
|
-
minZoom: 0.1,
|
|
81
|
-
maxZoom: 1,
|
|
82
|
-
style: {},
|
|
83
|
-
className: ''
|
|
84
|
-
};
|
|
85
|
-
// pan actions
|
|
86
|
-
panUp = () => this.props.panBy(0, this.props.deltaPan);
|
|
87
|
-
panDown = () => this.props.panBy(0, -1 * this.props.deltaPan);
|
|
88
|
-
panLeft = () => this.props.panBy(this.props.deltaPan, 0);
|
|
89
|
-
panRight = () => this.props.panBy(-1 * this.props.deltaPan, 0);
|
|
90
|
-
// zoom actions
|
|
91
|
-
zoomIn = () => this.props.zoomBy(this.props.deltaZoom);
|
|
92
|
-
zoomOut = () => this.props.zoomBy(-1 * this.props.deltaZoom);
|
|
93
|
-
onChangeZoomLevel = (evt) => {
|
|
94
|
-
const delta = evt.target.value - this.props.zoomLevel;
|
|
95
|
-
this.props.zoomBy(delta);
|
|
96
|
-
};
|
|
97
|
-
render() {
|
|
98
|
-
const buttons = [
|
|
99
|
-
{ top: -2, left: 14, rotate: 0, onClick: this.panUp, content: '▲', key: 'up' },
|
|
100
|
-
{ top: 12, left: 0, rotate: -90, onClick: this.panLeft, content: '◀', key: 'left' },
|
|
101
|
-
{ top: 12, left: 28, rotate: 90, onClick: this.panRight, content: '▶', key: 'right' },
|
|
102
|
-
{ top: 25, left: 14, rotate: 180, onClick: this.panDown, content: '▼', key: 'down' }
|
|
103
|
-
];
|
|
104
|
-
return (_jsxs(ViewControlWrapper, { children: [_jsxs(NavigationButtonContainer, { children: [buttons.map((b) => (_jsx(NavigationButton, { top: `${b.top}px`, left: `${b.left}px`, rotate: b.rotate, children: _jsx(LongPressButton, { onClick: b.onClick, children: b.content }) }, b.key))), _jsx(NavigationButton, { top: '12px', left: '16px', onClick: () => {
|
|
105
|
-
// console.log('on click fit bounds') || this.props.fitBounds;
|
|
106
|
-
}, children: '¤' })] }), _jsxs(ZoomControlWrapper, { children: [_jsx(ZoomControlButton, { children: _jsx(LongPressButton, { onClick: this.zoomIn, children: '+' }) }), _jsx(VerticalSlider, { children: _jsx("input", { type: "range", value: this.props.zoomLevel, min: this.props.minZoom, max: this.props.maxZoom, step: this.props.deltaZoom, onChange: this.onChangeZoomLevel,
|
|
107
|
-
/* @ts-expect-error TODO */
|
|
108
|
-
orient: "vertical" }) }), _jsx(ZoomControlButton, { children: _jsx(LongPressButton, { onClick: this.zoomOut, children: '-' }) })] })] }));
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
|
-
export class ViewControlWidget {
|
|
112
|
-
id = 'zoom';
|
|
113
|
-
props;
|
|
114
|
-
placement = 'top-left';
|
|
115
|
-
orientation = 'vertical';
|
|
116
|
-
viewId = null;
|
|
117
|
-
viewports = {};
|
|
118
|
-
deck;
|
|
119
|
-
element;
|
|
120
|
-
constructor(props) {
|
|
121
|
-
this.props = { ...ViewControl.defaultProps, ...props };
|
|
122
|
-
this.id = props.id || 'zoom';
|
|
123
|
-
this.viewId = props.viewId || null;
|
|
124
|
-
this.placement = props.placement || 'top-left';
|
|
125
|
-
// this.orientation = props.orientation || 'vertical';
|
|
126
|
-
// props.transitionDuration = props.transitionDuration || 200;
|
|
127
|
-
// props.zoomInLabel = props.zoomInLabel || 'Zoom In';
|
|
128
|
-
// props.zoomOutLabel = props.zoomOutLabel || 'Zoom Out';
|
|
129
|
-
props.style = props.style || {};
|
|
130
|
-
this.props = props;
|
|
131
|
-
}
|
|
132
|
-
onAdd({ deck }) {
|
|
133
|
-
this.deck = deck;
|
|
134
|
-
this.element = document.createElement('div');
|
|
135
|
-
const { style, className } = this.props;
|
|
136
|
-
this.element.classList.add('deck-widget', 'deck-widget-zoom');
|
|
137
|
-
if (className) {
|
|
138
|
-
this.element.classList.add(className);
|
|
139
|
-
}
|
|
140
|
-
if (style) {
|
|
141
|
-
Object.entries(style).map(([key, value]) => this.element.style.setProperty(key, value));
|
|
142
|
-
}
|
|
143
|
-
const ui = (_jsx(ViewControl, { ...this.props, zoomBy: this.handleDeltaZoom.bind(this), panBy: this.handlePanBy.bind(this) }));
|
|
144
|
-
render(ui, this.element);
|
|
145
|
-
return this.element;
|
|
146
|
-
}
|
|
147
|
-
onRemove() {
|
|
148
|
-
this.deck = undefined;
|
|
149
|
-
this.element = undefined;
|
|
150
|
-
}
|
|
151
|
-
setProps(props) {
|
|
152
|
-
Object.assign(this.props, props);
|
|
153
|
-
}
|
|
154
|
-
onViewportChange(viewport) {
|
|
155
|
-
this.viewports[viewport.id] = viewport;
|
|
156
|
-
}
|
|
157
|
-
handleDeltaZoom(deltaZoom) {
|
|
158
|
-
// console.log('Handle delta zoom');
|
|
159
|
-
for (const view of this.deck.getViewports()) {
|
|
160
|
-
this.handleZoomView(view, view.zoom + deltaZoom);
|
|
161
|
-
}
|
|
162
|
-
}
|
|
163
|
-
handlePanBy(deltaX, deltaY) {
|
|
164
|
-
// console.log('Handle panby', deltaX, deltaY);
|
|
165
|
-
for (const viewport of this.deck.getViewports()) {
|
|
166
|
-
this.handlePanViewport(viewport, deltaX, deltaY);
|
|
167
|
-
}
|
|
168
|
-
}
|
|
169
|
-
handleZoomView(viewport, nextZoom) {
|
|
170
|
-
const viewId = this.viewId || viewport?.id || 'default-view';
|
|
171
|
-
// @ts-expect-error TODO we lack a proper API for getting viewStates
|
|
172
|
-
const viewState = this.deck.viewManager.viewState || viewport;
|
|
173
|
-
const nextViewState = {
|
|
174
|
-
...viewState,
|
|
175
|
-
zoom: nextZoom
|
|
176
|
-
// transitionDuration: this.props.transitionDuration,
|
|
177
|
-
// transitionInterpolator: new FlyToInterpolator()
|
|
178
|
-
};
|
|
179
|
-
// @ts-ignore Using private method temporary until there's a public one
|
|
180
|
-
this.deck._onViewStateChange({ viewId, viewState: nextViewState, interactionState: {} });
|
|
181
|
-
}
|
|
182
|
-
handlePanViewport(viewport, deltaX, deltaY) {
|
|
183
|
-
const viewId = this.viewId || viewport?.id || 'default-view';
|
|
184
|
-
// @ts-expect-error TODO we lack a proper API for getting viewStates
|
|
185
|
-
const viewState = this.deck.viewManager.viewState || viewport;
|
|
186
|
-
// console.log('Handle pan viewport', deltaX, deltaY, viewState);
|
|
187
|
-
const nextViewState = {
|
|
188
|
-
...viewState,
|
|
189
|
-
position: [viewport.position[0] + deltaX, viewport.position[1] + deltaY]
|
|
190
|
-
};
|
|
191
|
-
// @ts-ignore Using private method temporary until there's a public one
|
|
192
|
-
this.deck._onViewStateChange({ viewId, viewState: nextViewState, interactionState: {} });
|
|
193
|
-
}
|
|
194
|
-
}
|
|
195
|
-
//# sourceMappingURL=view-control-widget.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"view-control-widget.js","sourceRoot":"","sources":["../../src/widgets/view-control-widget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +0,0 @@
|
|
|
1
|
-
// deck.gl-community
|
|
2
|
-
// SPDX-License-Identifier: MIT
|
|
3
|
-
// Copyright (c) vis.gl contributors
|
|
4
|
-
|
|
5
|
-
import {createGraph} from './create-graph';
|
|
6
|
-
import {basicNodeParser} from './node-parsers';
|
|
7
|
-
import {basicEdgeParser} from './edge-parsers';
|
|
8
|
-
import {log} from '../utils/log';
|
|
9
|
-
|
|
10
|
-
export const JSONLoader = ({json, nodeParser = basicNodeParser, edgeParser = basicEdgeParser}) => {
|
|
11
|
-
const {name = 'default', nodes, edges} = json;
|
|
12
|
-
if (!nodes) {
|
|
13
|
-
log.error('Invalid graph: nodes is missing.')();
|
|
14
|
-
return null;
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
const graph = createGraph({name, nodes, edges, nodeParser, edgeParser});
|
|
18
|
-
return graph;
|
|
19
|
-
};
|
package/src/style/style-sheet.ts
DELETED
|
@@ -1,277 +0,0 @@
|
|
|
1
|
-
// deck.gl-community
|
|
2
|
-
// SPDX-License-Identifier: MIT
|
|
3
|
-
// Copyright (c) vis.gl contributors
|
|
4
|
-
|
|
5
|
-
import {StyleProperty} from './style-property';
|
|
6
|
-
|
|
7
|
-
import {NODE_TYPE, EDGE_DECORATOR_TYPE} from '../core/constants';
|
|
8
|
-
import {log} from '../utils/log';
|
|
9
|
-
|
|
10
|
-
const COMMON_DECKGL_PROPS = {
|
|
11
|
-
getOffset: 'offset',
|
|
12
|
-
opacity: 'opacity'
|
|
13
|
-
};
|
|
14
|
-
|
|
15
|
-
const DECKGL_ACCESSOR_MAP = {
|
|
16
|
-
[NODE_TYPE.CIRCLE]: {
|
|
17
|
-
...COMMON_DECKGL_PROPS,
|
|
18
|
-
getFillColor: 'fill',
|
|
19
|
-
getLineColor: 'stroke',
|
|
20
|
-
getLineWidth: 'strokeWidth',
|
|
21
|
-
getRadius: 'radius'
|
|
22
|
-
},
|
|
23
|
-
|
|
24
|
-
[NODE_TYPE.RECTANGLE]: {
|
|
25
|
-
...COMMON_DECKGL_PROPS,
|
|
26
|
-
getWidth: 'width',
|
|
27
|
-
getHeight: 'height',
|
|
28
|
-
getFillColor: 'fill',
|
|
29
|
-
getLineColor: 'stroke',
|
|
30
|
-
getLineWidth: 'strokeWidth'
|
|
31
|
-
},
|
|
32
|
-
|
|
33
|
-
[NODE_TYPE.ROUNDED_RECTANGLE]: {
|
|
34
|
-
...COMMON_DECKGL_PROPS,
|
|
35
|
-
getCornerRadius: 'cornerRadius',
|
|
36
|
-
getRadius: 'radius',
|
|
37
|
-
getWidth: 'width',
|
|
38
|
-
getHeight: 'height',
|
|
39
|
-
getFillColor: 'fill',
|
|
40
|
-
getLineColor: 'stroke',
|
|
41
|
-
getLineWidth: 'strokeWidth'
|
|
42
|
-
},
|
|
43
|
-
|
|
44
|
-
[NODE_TYPE.PATH_ROUNDED_RECTANGLE]: {
|
|
45
|
-
...COMMON_DECKGL_PROPS,
|
|
46
|
-
getWidth: 'width',
|
|
47
|
-
getHeight: 'height',
|
|
48
|
-
getFillColor: 'fill',
|
|
49
|
-
getLineColor: 'stroke',
|
|
50
|
-
getLineWidth: 'strokeWidth',
|
|
51
|
-
getCornerRadius: 'cornerRadius'
|
|
52
|
-
},
|
|
53
|
-
|
|
54
|
-
[NODE_TYPE.LABEL]: {
|
|
55
|
-
...COMMON_DECKGL_PROPS,
|
|
56
|
-
getColor: 'color',
|
|
57
|
-
getText: 'text',
|
|
58
|
-
getSize: 'fontSize',
|
|
59
|
-
getTextAnchor: 'textAnchor',
|
|
60
|
-
getAlignmentBaseline: 'alignmentBaseline',
|
|
61
|
-
getAngle: 'angle',
|
|
62
|
-
scaleWithZoom: 'scaleWithZoom',
|
|
63
|
-
textMaxWidth: 'textMaxWidth',
|
|
64
|
-
textWordBreak: 'textWordBreak',
|
|
65
|
-
textSizeMinPixels: 'textSizeMinPixels'
|
|
66
|
-
},
|
|
67
|
-
|
|
68
|
-
[NODE_TYPE.MARKER]: {
|
|
69
|
-
...COMMON_DECKGL_PROPS,
|
|
70
|
-
getColor: 'fill',
|
|
71
|
-
getSize: 'size',
|
|
72
|
-
getMarker: 'marker',
|
|
73
|
-
scaleWithZoom: 'scaleWithZoom'
|
|
74
|
-
},
|
|
75
|
-
|
|
76
|
-
// --------- Edge related ---------
|
|
77
|
-
Edge: {
|
|
78
|
-
getColor: 'stroke',
|
|
79
|
-
getWidth: 'strokeWidth'
|
|
80
|
-
},
|
|
81
|
-
[EDGE_DECORATOR_TYPE.LABEL]: {
|
|
82
|
-
getColor: 'color',
|
|
83
|
-
getText: 'text',
|
|
84
|
-
getSize: 'fontSize',
|
|
85
|
-
getTextAnchor: 'textAnchor',
|
|
86
|
-
getAlignmentBaseline: 'alignmentBaseline',
|
|
87
|
-
scaleWithZoom: 'scaleWithZoom',
|
|
88
|
-
textMaxWidth: 'textMaxWidth',
|
|
89
|
-
textWordBreak: 'textWordBreak',
|
|
90
|
-
textSizeMinPixels: 'textSizeMinPixels'
|
|
91
|
-
},
|
|
92
|
-
[EDGE_DECORATOR_TYPE.FLOW]: {
|
|
93
|
-
getColor: 'color',
|
|
94
|
-
getWidth: 'width',
|
|
95
|
-
getSpeed: 'speed',
|
|
96
|
-
getTailLength: 'tailLength'
|
|
97
|
-
}
|
|
98
|
-
};
|
|
99
|
-
|
|
100
|
-
const DECKGL_UPDATE_TRIGGERS = {
|
|
101
|
-
[NODE_TYPE.CIRCLE]: ['getFillColor', 'getRadius', 'getLineColor', 'getLineWidth'],
|
|
102
|
-
[NODE_TYPE.RECTANGLE]: ['getFillColor', 'getLineColor', 'getLineWidth'],
|
|
103
|
-
[NODE_TYPE.ROUNDED_RECTANGLE]: [
|
|
104
|
-
'getFillColor',
|
|
105
|
-
'getLineColor',
|
|
106
|
-
'getLineWidth',
|
|
107
|
-
'getCornerRadius'
|
|
108
|
-
],
|
|
109
|
-
[NODE_TYPE.PATH_ROUNDED_RECTANGLE]: [
|
|
110
|
-
'getFillColor',
|
|
111
|
-
'getLineColor',
|
|
112
|
-
'getLineWidth',
|
|
113
|
-
'getCornerRadius'
|
|
114
|
-
],
|
|
115
|
-
[NODE_TYPE.LABEL]: [
|
|
116
|
-
'getColor',
|
|
117
|
-
'getText',
|
|
118
|
-
'getSize',
|
|
119
|
-
'getTextAnchor',
|
|
120
|
-
'getAlignmentBaseline',
|
|
121
|
-
'getAngle'
|
|
122
|
-
],
|
|
123
|
-
[NODE_TYPE.MARKER]: ['getColor', 'getSize', 'getMarker'],
|
|
124
|
-
Edge: ['getColor', 'getWidth'],
|
|
125
|
-
[EDGE_DECORATOR_TYPE.LABEL]: [
|
|
126
|
-
'getColor',
|
|
127
|
-
'getText',
|
|
128
|
-
'getSize',
|
|
129
|
-
'getTextAnchor',
|
|
130
|
-
'getAlignmentBaseline'
|
|
131
|
-
],
|
|
132
|
-
[EDGE_DECORATOR_TYPE.FLOW]: ['getColor', 'getWidth', 'getSpeed', 'getTailLength']
|
|
133
|
-
};
|
|
134
|
-
|
|
135
|
-
export class Stylesheet {
|
|
136
|
-
type: any;
|
|
137
|
-
properties: any;
|
|
138
|
-
constructor(style, updateTriggers) {
|
|
139
|
-
const {type: layerType, ...restStyle} = style;
|
|
140
|
-
if (!layerType || !(layerType in DECKGL_ACCESSOR_MAP)) {
|
|
141
|
-
throw new Error(`illegal type: ${layerType}`);
|
|
142
|
-
}
|
|
143
|
-
this.type = layerType;
|
|
144
|
-
|
|
145
|
-
// style = {
|
|
146
|
-
// type: 'circle',
|
|
147
|
-
// fill: 'red'
|
|
148
|
-
// radius: 5,
|
|
149
|
-
//
|
|
150
|
-
// ':hover': {
|
|
151
|
-
// fill: 'blue',
|
|
152
|
-
// stroke: 'red'
|
|
153
|
-
// }
|
|
154
|
-
// };
|
|
155
|
-
// step 1: extract 'rules': default, hover
|
|
156
|
-
// default: {fill: 'red', radius: 5};
|
|
157
|
-
// hover: {fill: 'blue', stroke: 'red'};
|
|
158
|
-
const rules = Object.keys(restStyle).reduce(
|
|
159
|
-
(res, key) => {
|
|
160
|
-
const isSelector = key.startsWith(':');
|
|
161
|
-
if (isSelector) {
|
|
162
|
-
const state = key.substring(1);
|
|
163
|
-
res[state] = restStyle[key];
|
|
164
|
-
return res;
|
|
165
|
-
}
|
|
166
|
-
res.default[key] = restStyle[key];
|
|
167
|
-
return res;
|
|
168
|
-
},
|
|
169
|
-
{
|
|
170
|
-
default: {}
|
|
171
|
-
}
|
|
172
|
-
);
|
|
173
|
-
|
|
174
|
-
// step 2: extract all unique attributes from rules
|
|
175
|
-
// attributes: ['fill', 'radius', 'stroke']
|
|
176
|
-
const attributes = Object.values(rules).reduce((res, rule) => {
|
|
177
|
-
const attrs = Object.keys(rule);
|
|
178
|
-
const set = new Set([...(res as any), ...attrs]);
|
|
179
|
-
return Array.from(set);
|
|
180
|
-
}, []);
|
|
181
|
-
// step 3: create a attribute map as:
|
|
182
|
-
// attrMap = {
|
|
183
|
-
// fill: {default: 'red', hover: 'blue'},
|
|
184
|
-
// radius: {default: 5},
|
|
185
|
-
// stroke: {hover: 'red'},
|
|
186
|
-
// }
|
|
187
|
-
const attrMap = (attributes as any).reduce((res, attr) => {
|
|
188
|
-
res[attr] = Object.entries(rules).reduce((acc, entry) => {
|
|
189
|
-
const [state, rule] = entry;
|
|
190
|
-
if (typeof rule[attr] !== 'undefined') {
|
|
191
|
-
acc[state] = rule[attr];
|
|
192
|
-
}
|
|
193
|
-
return acc;
|
|
194
|
-
}, {});
|
|
195
|
-
return res;
|
|
196
|
-
}, {});
|
|
197
|
-
|
|
198
|
-
// step 4: simplify the attribute map if only default exists for the attribute
|
|
199
|
-
// simplifiedStyleMap = {
|
|
200
|
-
// fill: {default: 'red', hover: 'blue'},
|
|
201
|
-
// radius: 5,
|
|
202
|
-
// stroke: {hover: 'red'},
|
|
203
|
-
// }
|
|
204
|
-
const simplifiedStyleMap = Object.entries(attrMap).reduce((res, entry) => {
|
|
205
|
-
const [attr, valueMap] = entry as any;
|
|
206
|
-
const onlyDefault = Object.keys(valueMap).length === 1 && valueMap.default !== undefined;
|
|
207
|
-
if (onlyDefault) {
|
|
208
|
-
res[attr] = valueMap.default;
|
|
209
|
-
return res;
|
|
210
|
-
}
|
|
211
|
-
res[attr] = valueMap;
|
|
212
|
-
return res;
|
|
213
|
-
}, {});
|
|
214
|
-
|
|
215
|
-
// step 5: create style property
|
|
216
|
-
// if the propety only maps to default state => return value only
|
|
217
|
-
// if the property maps to other states => return accessor function
|
|
218
|
-
|
|
219
|
-
// start to parse properties
|
|
220
|
-
this.properties = {};
|
|
221
|
-
for (const key in simplifiedStyleMap) {
|
|
222
|
-
this.properties[key] = new StyleProperty({
|
|
223
|
-
key,
|
|
224
|
-
value: simplifiedStyleMap[key],
|
|
225
|
-
updateTrigger: updateTriggers.stateUpdateTrigger
|
|
226
|
-
});
|
|
227
|
-
}
|
|
228
|
-
}
|
|
229
|
-
|
|
230
|
-
_getProperty(deckglAccessor) {
|
|
231
|
-
const map = DECKGL_ACCESSOR_MAP[this.type];
|
|
232
|
-
if (!map) {
|
|
233
|
-
throw new Error(`illegal type: ${this.type}`);
|
|
234
|
-
}
|
|
235
|
-
const styleProp = map[deckglAccessor];
|
|
236
|
-
if (!styleProp) {
|
|
237
|
-
log.error(`Invalid DeckGL accessor: ${deckglAccessor}`)();
|
|
238
|
-
throw new Error(`Invalid DeckGL accessor: ${deckglAccessor}`);
|
|
239
|
-
}
|
|
240
|
-
return this.properties[styleProp];
|
|
241
|
-
}
|
|
242
|
-
|
|
243
|
-
getDeckGLAccessor(deckglAccessor) {
|
|
244
|
-
const property = this._getProperty(deckglAccessor);
|
|
245
|
-
// get the value
|
|
246
|
-
if (property) {
|
|
247
|
-
return property.getValue();
|
|
248
|
-
}
|
|
249
|
-
// return default value
|
|
250
|
-
const styleProp = DECKGL_ACCESSOR_MAP[this.type][deckglAccessor];
|
|
251
|
-
return StyleProperty.getDefault(styleProp);
|
|
252
|
-
}
|
|
253
|
-
|
|
254
|
-
getDeckGLAccessorUpdateTrigger(deckglAccessor) {
|
|
255
|
-
const property = this._getProperty(deckglAccessor);
|
|
256
|
-
// get the value
|
|
257
|
-
if (property) {
|
|
258
|
-
return property.getUpdateTrigger();
|
|
259
|
-
}
|
|
260
|
-
return false;
|
|
261
|
-
}
|
|
262
|
-
|
|
263
|
-
getDeckGLAccessors() {
|
|
264
|
-
const accessorMap = DECKGL_ACCESSOR_MAP[this.type];
|
|
265
|
-
return Object.keys(accessorMap).reduce((res, accessor) => {
|
|
266
|
-
res[accessor] = this.getDeckGLAccessor(accessor);
|
|
267
|
-
return res;
|
|
268
|
-
}, {});
|
|
269
|
-
}
|
|
270
|
-
|
|
271
|
-
getDeckGLUpdateTriggers() {
|
|
272
|
-
return DECKGL_UPDATE_TRIGGERS[this.type].reduce((res, accessor) => {
|
|
273
|
-
res[accessor] = this.getDeckGLAccessorUpdateTrigger(accessor);
|
|
274
|
-
return res;
|
|
275
|
-
}, {});
|
|
276
|
-
}
|
|
277
|
-
}
|
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
// deck.gl-community
|
|
2
|
-
// SPDX-License-Identifier: MIT
|
|
3
|
-
// Copyright (c) vis.gl contributors
|
|
4
|
-
|
|
5
|
-
import {Component} from 'preact';
|
|
6
|
-
|
|
7
|
-
export type LongPressButtonProps = {
|
|
8
|
-
onClick: () => void;
|
|
9
|
-
children: any;
|
|
10
|
-
};
|
|
11
|
-
|
|
12
|
-
export class LongPressButton extends Component<LongPressButtonProps> {
|
|
13
|
-
buttonPressTimer: ReturnType<typeof setTimeout> | null = null;
|
|
14
|
-
|
|
15
|
-
_repeat = () => {
|
|
16
|
-
if (this.buttonPressTimer) {
|
|
17
|
-
this.props.onClick();
|
|
18
|
-
this.buttonPressTimer = setTimeout(this._repeat, 100);
|
|
19
|
-
}
|
|
20
|
-
};
|
|
21
|
-
|
|
22
|
-
_handleButtonPress = () => {
|
|
23
|
-
this.buttonPressTimer = setTimeout(this._repeat, 100);
|
|
24
|
-
};
|
|
25
|
-
|
|
26
|
-
_handleButtonRelease = () => {
|
|
27
|
-
if (this.buttonPressTimer) {
|
|
28
|
-
clearTimeout(this.buttonPressTimer);
|
|
29
|
-
}
|
|
30
|
-
this.buttonPressTimer = null;
|
|
31
|
-
};
|
|
32
|
-
|
|
33
|
-
render() {
|
|
34
|
-
return (
|
|
35
|
-
<div className="deck-widget-button">
|
|
36
|
-
<div
|
|
37
|
-
style={{
|
|
38
|
-
pointerEvents: 'auto'
|
|
39
|
-
}}
|
|
40
|
-
onMouseDown={(event) => {
|
|
41
|
-
this._handleButtonPress();
|
|
42
|
-
document.addEventListener('mouseup', this._handleButtonRelease, {once: true});
|
|
43
|
-
}}
|
|
44
|
-
>
|
|
45
|
-
{this.props.children}
|
|
46
|
-
</div>
|
|
47
|
-
</div>
|
|
48
|
-
);
|
|
49
|
-
}
|
|
50
|
-
}
|