Merge branch 'main' of github.com:reearth/reearth-visualizer into fea…

…t/project-recylebin
reearth · Oct 23, 2024 · 9c4ee8e · 9c4ee8e
2 parents 46edbd8 + bf5e7f8
commit 9c4ee8e
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 29 deletions.
diff --git a/.../beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/Field/index.tsx b/.../beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/Field/index.tsx
@@ -1,9 +1,11 @@
+import { IMAGE_TYPES } from "@reearth/beta/features/AssetsManager/constants";
 import {
   ColorInput,
   NumberInput,
   Selector,
   TextInput
 } from "@reearth/beta/lib/reearth-ui";
+import { AssetField } from "@reearth/beta/ui/fields";
 import { FC } from "react";
 
 import { AppearanceField, StyleSimpleValue, Typography } from "../../types";
@@ -47,6 +49,14 @@ const fieldComponents = {
       value={props.value as Typography}
       onChange={props.onUpdate}
     />
+  ),
+  image: (props: FieldProps) => (
+    <AssetField
+      inputMethod="asset"
+      value={props.value as string}
+      assetsTypes={IMAGE_TYPES}
+      onChange={props.onUpdate}
+    />
   )
 };
 

diff --git a/...src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/ValueTab.tsx b/...src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/StyleNode/ValueTab.tsx
@@ -29,7 +29,7 @@ export default ValueTab;
 
 const Wrapper = styled("div")(({ theme }) => ({
   display: "flex",
+  flexDirection: "column",
   gap: theme.spacing.smallest,
-  alignItems: "center",
   minHeight: 28
 }));
diff --git a/.../beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/appearanceNodes/marker.ts b/.../beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/appearanceNodes/marker.ts
@@ -56,7 +56,7 @@ export const markerNodes: AppearanceNode[] = [
   {
     id: "image",
     title: "Image",
-    field: "text",
+    field: "image",
     defaultValue: ""
   },
   {

diff --git a/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/types.ts b/web/src/beta/features/Editor/Map/LayerStylePanel/Editor/StyleInterface/types.ts
@@ -11,7 +11,8 @@ export type AppearanceField =
   | "number"
   | "select"
   | "text"
-  | "typography";
+  | "typography"
+  | "image";
 
 export type AppearanceNodes = Record<AppearanceType, AppearanceNode[]>;
 

diff --git a/web/src/beta/features/Editor/Map/LayerStylePanel/PresetLayerStyle/presetLayerStyles.ts b/web/src/beta/features/Editor/Map/LayerStylePanel/PresetLayerStyle/presetLayerStyles.ts
@@ -1,6 +1,7 @@
+import { LayerAppearanceTypes } from "@reearth/core";
 import { LayerStyle } from "@reearth/services/api/layerStyleApi/utils";
 
-export const defaultStyle = {
+export const defaultStyle: Partial <LayerAppearanceTypes>   = {
   marker: {
     heightReference: "clamp"
   },

diff --git a/web/src/beta/features/Editor/Visualizer/convert.ts b/web/src/beta/features/Editor/Visualizer/convert.ts
@@ -1,3 +1,4 @@
+import { defaultStyle } from "@reearth/beta/features/Editor/Map/LayerStylePanel/PresetLayerStyle/presetLayerStyles";
 import {
   type WidgetZone,
   type WidgetSection,
@@ -12,10 +13,7 @@ import {
   isBuiltinWidget
 } from "@reearth/beta/features/Visualizer/Crust/Widgets";
 import { WidgetAreaPadding } from "@reearth/beta/features/Visualizer/Crust/Widgets/WidgetAlignSystem/types";
-import {
-  DEFAULT_LAYER_STYLE,
-  valueTypeFromGQL
-} from "@reearth/beta/utils/value";
+import { valueTypeFromGQL } from "@reearth/beta/utils/value";
 import { LayerAppearanceTypes } from "@reearth/core";
 import type { Layer } from "@reearth/core";
 import { NLSLayer } from "@reearth/services/api/layersApi/utils";
@@ -402,7 +400,7 @@ export function processLayers(
       }
     }
 
-    return DEFAULT_LAYER_STYLE;
+    return defaultStyle;
   };
 
   return newLayers?.map((nlsLayer) => {

diff --git a/web/src/beta/features/Published/convert-new-property.ts b/web/src/beta/features/Published/convert-new-property.ts
@@ -1,5 +1,5 @@
+import { defaultStyle } from "@reearth/beta/features/Editor/Map/LayerStylePanel/PresetLayerStyle/presetLayerStyles";
 import { InfoboxBlock } from "@reearth/beta/features/Visualizer/Crust/Infobox/types";
-import { DEFAULT_LAYER_STYLE } from "@reearth/beta/utils/value";
 import { Layer, LayerAppearanceTypes } from "@reearth/core";
 import {
   NLSInfobox,
@@ -70,7 +70,7 @@ export function processLayers(
       }
     }
 
-    return DEFAULT_LAYER_STYLE;
+    return defaultStyle;
   };
 
   return newLayers?.map((nlsLayer) => {

diff --git a/web/src/beta/utils/value.ts b/web/src/beta/utils/value.ts
@@ -1,4 +1,3 @@
-import { LayerAppearanceTypes } from "@reearth/core";
 import { ValueType as GQLValueType } from "@reearth/services/gql";
 import { css } from "@reearth/services/theme";
 import { Color } from "cesium";
@@ -253,20 +252,3 @@ export const zeroValues: { [key in ValueType]?: ValueTypes[ValueType] } = {
   string: ""
 };
 
-export const DEFAULT_LAYER_STYLE: Partial<LayerAppearanceTypes> = {
-  "3dtiles": {
-    show: true
-  },
-  resource: {
-    clampToGround: true
-  },
-  marker: {
-    heightReference: "clamp"
-  },
-  polygon: {
-    heightReference: "clamp"
-  },
-  polyline: {
-    clampToGround: true
-  }
-};