fix: blocks cannot be displayed and updated as expected on reearth/co…

…re (#434) * fix: 3dtiles infobox on reearth/core * fix: unnecessary render * fix: entire block feature * fix: lint
reearth · Feb 7, 2023 · b5f921c · b5f921c
1 parent 20382c7
commit b5f921c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/core/Crust/Infobox/index.tsx b/src/core/Crust/Infobox/index.tsx
@@ -35,6 +35,7 @@ export type Props = {
     fieldId: string,
     value: ValueTypes[T],
     type: T,
+    layer?: Layer,
   ) => void;
   onBlockMove?: (id: string, fromIndex: number, toIndex: number) => void;
   onBlockDelete?: (id: string) => void;
@@ -124,7 +125,7 @@ const Infobox: React.FC<Props> = ({
             isEditable={isEditable}
             isBuilt={isBuilt}
             infoboxProperty={property}
-            onChange={(...args) => onBlockChange?.(b.id, ...args)}
+            onChange={(...args) => onBlockChange?.(b.id, ...args, props.layer)}
             onClick={() => {
               if (b.id && selectedBlockId !== b.id) {
                 onBlockSelect?.(b.id);

diff --git a/src/core/Map/Layers/hooks.ts b/src/core/Map/Layers/hooks.ts
@@ -697,7 +697,7 @@ function useSelection({
   useEffect(() => {
     setSelectedLayer(s =>
       s[0]?.layerId && flattenedLayers?.find(l => l.id === s[0]?.layerId)
-        ? s
+        ? [{ ...s[0] }, s[1]] // Force update when flattenedLayers are updated
         : !s[0]?.layerId && !s[1]
         ? s
         : [undefined, undefined],

diff --git a/src/core/Visualizer/hooks.ts b/src/core/Visualizer/hooks.ts
@@ -118,7 +118,12 @@ export default function useHooks({
             isEditable: !overriddenInfobox && !!selectedLayer.layer?.layer?.infobox,
             visible: !!selectedLayer.layer?.layer?.infobox,
             property: selectedLayer.layer?.layer.infobox?.property?.default,
-            blocks: overridenInfoboxBlocks(overriddenInfobox),
+            blocks:
+              overridenInfoboxBlocks(overriddenInfobox) ||
+              selectedLayer.layer?.layer.infobox?.blocks?.map(b => ({
+                ...b,
+                property: b.property.default ?? b.property,
+              })),
           }
         : undefined,
     [selectedLayer, overriddenInfobox],