Merge branch 'main' into release

Author: reearth-app[bot]

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
         uses: tj-actions/changed-files@v45
         with:
           files: |
-            web
+            web/
             .github/workflows/ci_web.yml
             .github/workflows/build_web.yml
             .github/workflows/deploy_web_nightly.yml
@@ -30,7 +30,7 @@ jobs:
         uses: tj-actions/changed-files@v45
         with:
           files: |
-            server
+            server/
             .github/workflows/ci_server.yml
             .github/workflows/build_server.yml
             .github/workflows/deploy_server_nightly.yml

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reearth/visualizer",
-  "version": "1.0.0-beta.3.1",
+  "version": "1.0.0-beta.3.2",
   "repository": "https://github.com/reearth/reearth-visualizer.git",
   "author": "Re:Earth contributors <[email protected]>",
   "license": "Apache-2.0",
@@ -129,7 +129,7 @@
     "@monaco-editor/react": "4.6.0",
     "@popperjs/core": "2.11.8",
     "@radix-ui/react-slot": "1.1.0",
-    "@reearth/core": "0.0.7-alpha.29",
+    "@reearth/core": "0.0.7-alpha.30",
     "@rot1024/use-transition": "1.0.0",
     "@sentry/browser": "7.77.0",
     "@seznam/compose-react-refs": "1.0.6",

web/postcss.config.js

@@ -1,6 +1,6 @@
 export default {
   plugins: {
     tailwindcss: {},
-    autoprefixer: {},
-  },
-}
+    autoprefixer: {}
+  }
+};

web/src/beta/features/Editor/hooks/useLayers.ts

@@ -86,23 +86,22 @@ export default function ({
 
   const [sortedLayerIds, setSortedLayerIds] = useState<string[]>([]);
 
-useEffect(() => {
-  if (!originNlsLayers) return;
-
-  setSortedLayerIds((prev) => {
-    const originIds = originNlsLayers.map((l) => l.id);
-    if (
-      prev.length === originIds.length &&
-      prev.every((id, idx) => id === originIds[idx])
-    ) {
-      return prev;
-    }
-    return [...originNlsLayers]
-      .sort((a, b) => (a.index ?? 0) - (b.index ?? 0))
-      .map((l) => l.id);
-  });
-}, [originNlsLayers]);
-
+  useEffect(() => {
+    if (!originNlsLayers) return;
+
+    setSortedLayerIds((prev) => {
+      const originIds = originNlsLayers.map((l) => l.id);
+      if (
+        prev.length === originIds.length &&
+        prev.every((id, idx) => id === originIds[idx])
+      ) {
+        return prev;
+      }
+      return [...originNlsLayers]
+        .sort((a, b) => (a.index ?? 0) - (b.index ?? 0))
+        .map((l) => l.id);
+    });
+  }, [originNlsLayers]);
 
   const nlsLayers: NLSLayer[] = useMemo(
     () =>

web/src/beta/features/PluginPlayground/Plugins/presets/layers/add-kml.ts

@@ -71,8 +71,7 @@ const layerKmlUrl = {
 reearth.layers.add(layerKmlEncoded);
 
 // Add the KML layer from the URL to Re:Earth
-reearth.layers.add(layerKmlUrl);`,
-
+reearth.layers.add(layerKmlUrl);`
 };
 
 export const addKml: PluginType = {

web/src/beta/features/Visualizer/Crust/Infobox/Block/builtin/PropertyList/CustomFields/useEvaluateProperties.ts

@@ -18,7 +18,6 @@ export default ({ properties, selectedFeature }: Props) => {
     PropertyListItem[] | undefined
   >(undefined);
 
-
   // We want the useEffect to be called on each render to make sure evaluatedProperties is up to date
   useEffect(() => {
     if (!isReady) {

web/src/beta/features/Visualizer/Crust/Infobox/Block/builtin/PropertyList/ListEditor/index.tsx

@@ -106,7 +106,15 @@ const ListEditor: FC<Props> = ({
           />
         )
       })),
-    [currentPropertyList, editKeyIndex, editValueIndex, handleKeyBlur, handleValueBlur, handleDoubleClick, handlePropertyValueRemove]
+    [
+      currentPropertyList,
+      editKeyIndex,
+      editValueIndex,
+      handleKeyBlur,
+      handleValueBlur,
+      handleDoubleClick,
+      handlePropertyValueRemove
+    ]
   );
 
   return (
@@ -177,4 +185,4 @@ const ActionsWrapper = styled("div")(({ theme }) => ({
   gap: theme.spacing.smallest,
   alignItems: "center",
   boxSizing: "border-box"
-}));
+}));

web/src/beta/features/Visualizer/Crust/StoryPanel/PanelContent/index.tsx

@@ -155,5 +155,5 @@ const PagesWrapper = styled("div")<{
 }));
 
 const PageGap = styled("div")<{ height?: number }>(({ height }) => ({
-  height: height ? `${height}px` : "70vh",
+  height: height ? `${height}px` : "70vh"
 }));

web/src/beta/lib/reearth-ui/components/index.ts

@@ -29,4 +29,4 @@ export * from "./Markdown";
 export * from "./Slider";
 export * from "./Slide";
 export * from "./ClickAway";
-export * from "./RangeSlider";
+export * from "./RangeSlider";

web/src/beta/ui/fields/CameraField/hooks.ts

@@ -74,13 +74,12 @@ export default ({
     setNewCamera((prev) => (prev ? { ...prev, [key]: value } : defaultCamera));
   }, []);
 
-
   const handleSave = useCallback(() => {
     if (!newCamera) return;
     const data = handleCameraDegreeToRadian(newCamera);
-     if (JSON.stringify(newCamera) === JSON.stringify(defaultCamera)) {
-       onFlyTo?.(data);
-     }
+    if (JSON.stringify(newCamera) === JSON.stringify(defaultCamera)) {
+      onFlyTo?.(data);
+    }
     onSave?.(data);
     onClose?.();
   }, [newCamera, onClose, onFlyTo, onSave]);

web/yarn.lock

@@ -8453,9 +8453,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@reearth/core@npm:0.0.7-alpha.29":
-  version: 0.0.7-alpha.29
-  resolution: "@reearth/core@npm:0.0.7-alpha.29"
+"@reearth/core@npm:0.0.7-alpha.30":
+  version: 0.0.7-alpha.30
+  resolution: "@reearth/core@npm:0.0.7-alpha.30"
   dependencies:
     "@radix-ui/react-checkbox": "npm:1.1.1"
     "@radix-ui/react-dialog": "npm:1.1.1"
@@ -8510,7 +8510,7 @@ __metadata:
     cesium: 1.118.x
     react: ^18.2.0
     react-dom: ^18.2.0
-  checksum: 10c0/4cd5745c9724c41b26f39089d1792d50a4a8fb6d309df3311d92714b4913bf99754bcecaf1c94205f51056704dfc347347b6531bbb2f5609bf1f74297b3db8dc
+  checksum: 10c0/50c201f745e6916557adc3e1740c93fa73849f1710f7bd09b969e60580c095036118b35daf0daad83bba0e456f0c91db73bf1fde7cc389f4cd06936ad779d9cd
   languageName: node
   linkType: hard
 
@@ -8559,7 +8559,7 @@ __metadata:
     "@playwright/test": "npm:1.46.1"
     "@popperjs/core": "npm:2.11.8"
     "@radix-ui/react-slot": "npm:1.1.0"
-    "@reearth/core": "npm:0.0.7-alpha.29"
+    "@reearth/core": "npm:0.0.7-alpha.30"
     "@rollup/plugin-yaml": "npm:4.1.2"
     "@rot1024/use-transition": "npm:1.0.0"
     "@sentry/browser": "npm:7.77.0"