@gramps-connect/story 0.5.0 → 0.6.1

package/README.md

@@ -197,7 +197,7 @@ dependencies `@mantine/core` and `@mantine/hooks`, needed only by the
 editor): wrap it in a `MantineProvider` and load Mantine's stylesheet. The
 pieces it's made of (`SlideList`, `StoryTextField`, `DateField`,
 `PlaceField`, `PhotosField`, `MapEditor`, `PlaceMapDialog`) and its editing functions (`addSlide`, `moveSlide`,
-`updateSlide`, `addImage`, undo history, ...) are exported too.
+`updateSlide`, `addImage`, undo history (`History<T>`, for any document), ...) are exported too.
 
 ## Writing stories from Python: `python/gramps_connect_story.py`
 

package/dist/editor.js

@@ -3802,6 +3802,7 @@ var COLOR_SWATCHES = [
   "#e0678a",
   "#555555"
 ];
+var UNSET_OPACITY = 0.25;
 var EMPTY_LABEL_PREVIEW = { type: "FeatureCollection", features: [] };
 var OVERLAY_ANCHOR_LAYER = "image-overlay-anchor";
 var TERRA_DRAW_LAYERS = ["td-polygon", "td-polygon-outline", "td-linestring", "td-point", "td-point-marker"];
@@ -3905,9 +3906,11 @@ var MapEditor = forwardRef(function MapEditor2({
   const [color, setColor] = useState7(() => defaultColor ?? defaultColors(dark).mark);
   const colorRef = useRef8(color);
   colorRef.current = color;
-  const [opacity, setOpacity] = useState7(0.25);
+  const [opacity, setOpacity] = useState7(UNSET_OPACITY);
   const opacityRef = useRef8(opacity);
   opacityRef.current = opacity;
+  const unsetColorRef = useRef8(defaultColor ?? defaultColors(dark).mark);
+  unsetColorRef.current = defaultColor ?? defaultColors(dark).mark;
   const [labelText, setLabelText] = useState7("");
   const refreshLabelPreviewRef = useRef8(null);
   const [selectedId, setSelectedId] = useState7(null);
@@ -3970,8 +3973,8 @@ var MapEditor = forwardRef(function MapEditor2({
     map.dragRotate.disable();
     map.touchZoomRotate.disableRotation();
     map.keyboard.disableRotation();
-    const readColor = (feature) => feature.properties.color ?? colorRef.current;
-    const readOpacity = (feature) => feature.properties.opacity ?? opacityRef.current;
+    const readColor = (feature) => feature.properties.color ?? unsetColorRef.current;
+    const readOpacity = (feature) => feature.properties.opacity ?? UNSET_OPACITY;
     const draw = new TerraDraw({
       adapter: new TerraDrawMapLibreGLAdapter({ map }),
       modes: [
@@ -4060,8 +4063,8 @@ var MapEditor = forwardRef(function MapEditor2({
       const feature = id ? draw.getSnapshot().find((f) => String(f.id) === id) : void 0;
       setLabelText(feature?.properties?.name ?? "");
       if (feature) {
-        setColor(feature.properties?.color ?? colorRef.current);
-        setOpacity(feature.properties?.opacity ?? 0.25);
+        setColor(feature.properties?.color ?? unsetColorRef.current);
+        setOpacity(feature.properties?.opacity ?? UNSET_OPACITY);
         setSelectedOverlayId(null);
       }
     }
@@ -4471,12 +4474,13 @@ var MapEditor = forwardRef(function MapEditor2({
     getResult() {
       const savedParts = (drawRef.current?.getSnapshot() ?? []).filter((f) => f.geometry != null && !f.properties?.selectionPoint && !f.properties?.midPoint).map((f) => {
         const name = f.properties?.name?.trim();
-        const regionOpacity = f.geometry.type === "Polygon" ? f.properties?.opacity ?? opacityRef.current : void 0;
+        const regionOpacity = f.geometry.type === "Polygon" ? f.properties?.opacity : void 0;
+        const color2 = f.properties?.color;
         const sourceKey = f.properties?.sourceKey;
         return {
           ...typeof sourceKey === "string" ? { sourceKey } : {},
           geometry: f.geometry,
-          color: f.properties?.color ?? colorRef.current,
+          ...color2 !== void 0 ? { color: color2 } : {},
           ...name ? { name } : {},
           ...regionOpacity !== void 0 ? { opacity: regionOpacity } : {}
         };