From 3b1892f42a46df4a94b9e0a123e5ea45faeba656 Mon Sep 17 00:00:00 2001 From: pyshx Date: Thu, 30 Mar 2023 02:58:10 +0530 Subject: [PATCH 1/2] feat(plugin): add resource override to field components --- .../Field/Fields/point/PointColor/index.tsx | 7 +++++++ .../DatasetCard/Field/Fields/point/PointSize.tsx | 2 +- .../Field/Fields/point/PointStroke/index.tsx | 12 ++++++++++++ .../Field/Fields/polygon/PolygonColor/index.tsx | 3 +++ .../Field/Fields/polygon/PolygonStroke/index.tsx | 12 ++++++++++++ .../Field/Fields/polyline/PolylineColor/index.tsx | 7 +++++++ .../Field/Fields/polyline/PolylineStrokeWeight.tsx | 3 +++ 7 files changed, 45 insertions(+), 1 deletion(-) diff --git a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/point/PointColor/index.tsx b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/point/PointColor/index.tsx index 2a5173c41..a3c85f6bd 100644 --- a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/point/PointColor/index.tsx +++ b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/point/PointColor/index.tsx @@ -110,5 +110,12 @@ const generateOverride = (pointColors: PointColorType["pointColors"]) => { }, }, }, + resource: { + markerColor: { + expression: { + conditions, + }, + }, + }, }; }; diff --git a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/point/PointSize.tsx b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/point/PointSize.tsx index 995d25fff..bcea79832 100644 --- a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/point/PointSize.tsx +++ b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/point/PointSize.tsx @@ -18,7 +18,7 @@ const PointSize: React.FC> = ({ value, editMode, onU onUpdate({ ...value, pointSize: size, - override: { marker: { style: "point", pointSize: size } }, + override: { marker: { style: "point", pointSize: size }, resource: { markerSize: size } }, }); }, 500); return () => { diff --git a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/point/PointStroke/index.tsx b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/point/PointStroke/index.tsx index bc34c566c..e4437793d 100644 --- a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/point/PointStroke/index.tsx +++ b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/point/PointStroke/index.tsx @@ -131,5 +131,17 @@ const generateOverride = (items: PointStrokeType["items"]) => { }, }, }, + resource: { + stroke: { + expression: { + conditions: pointOutlineColorConditions, + }, + }, + strokeWidth: { + expression: { + conditions: pointOutlineWidthConditions, + }, + }, + }, }; }; diff --git a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polygon/PolygonColor/index.tsx b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polygon/PolygonColor/index.tsx index 2d62a7937..5e24c9b8d 100644 --- a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polygon/PolygonColor/index.tsx +++ b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polygon/PolygonColor/index.tsx @@ -110,5 +110,8 @@ const generateOverride = (items: PolygonColorType["items"]) => { }, fillColor: { expression: { conditions: fillColorConditions } }, }, + resource: { + fill: { expression: { conditions: fillColorConditions } }, + }, }; }; diff --git a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polygon/PolygonStroke/index.tsx b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polygon/PolygonStroke/index.tsx index cb34fdf7c..5a1261e56 100644 --- a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polygon/PolygonStroke/index.tsx +++ b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polygon/PolygonStroke/index.tsx @@ -137,5 +137,17 @@ const generateOverride = (items: PolygonStrokeType["items"]) => { }, }, }, + resource: { + stroke: { + expression: { + conditions: strokeColorConditions, + }, + }, + strokeWidth: { + expression: { + conditions: strokeWidthConditions, + }, + }, + }, }; }; diff --git a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polyline/PolylineColor/index.tsx b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polyline/PolylineColor/index.tsx index ad31b3772..c893bf9cc 100644 --- a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polyline/PolylineColor/index.tsx +++ b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polyline/PolylineColor/index.tsx @@ -113,5 +113,12 @@ const generateOverride = (items: PolylineColorType["items"]) => { }, }, }, + resource: { + stroke: { + expression: { + conditions: strokeColorConditions, + }, + }, + }, }; }; diff --git a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polyline/PolylineStrokeWeight.tsx b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polyline/PolylineStrokeWeight.tsx index 4da278820..e5f1aeec8 100644 --- a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polyline/PolylineStrokeWeight.tsx +++ b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/Fields/polyline/PolylineStrokeWeight.tsx @@ -26,6 +26,9 @@ const PolylineStrokeWeight: React.FC> = ( polyline: { strokeWidth, }, + resource: { + strokeWidth, + }, }, }); }, 500); From 135137d55b43b6f01a7a4ce31f502f32465b7b11 Mon Sep 17 00:00:00 2001 From: pyshx Date: Sat, 1 Apr 2023 03:33:04 +0530 Subject: [PATCH 2/2] fix: add cleanseOverrides for resource --- .../content/common/DatasetCard/Field/fieldConstants.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/fieldConstants.ts b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/fieldConstants.ts index 964e71d38..af9d27d08 100644 --- a/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/fieldConstants.ts +++ b/plugin/web/extensions/sidebar/core/components/content/common/DatasetCard/Field/fieldConstants.ts @@ -132,4 +132,11 @@ export const cleanseOverrides: { [key: string]: any } = { show: true, }, }, + resource: { + markerSize: 10, + markerColor: "white", + stroke: "white", + strokeWidth: 5, + fill: "transparent", + }, };