UI changes to add submission

Author: CannonLock

src/pages/maps/@id/edit/components/cell/interval-selection.ts

@@ -1,5 +1,5 @@
 import {Button, MenuItem} from "@blueprintjs/core";
-import { Select, ItemRenderer, ItemPredicate } from "@blueprintjs/select";
+import { Select2, ItemRenderer, ItemPredicate } from "@blueprintjs/select";
 import {EditableCell2Props, EditableCell2, Cell} from "@blueprintjs/table";
 import React, {useEffect, useMemo} from "react";
 
@@ -33,7 +33,7 @@ const IntervalOption: ItemRenderer<Interval> = (interval: Interval, { handleClic
 
 	if (interval == null) {
 		return h(MenuItem, {
-			shouldDismissPopover: false,
+			shouldDismissPopover: true,
 			active: modifiers.active,
 			disabled: modifiers.disabled,
 			key: "",
@@ -47,7 +47,7 @@ const IntervalOption: ItemRenderer<Interval> = (interval: Interval, { handleClic
 
 	return h(MenuItem, {
 		style: {backgroundColor: interval.color},
-		shouldDismissPopover: false,
+		shouldDismissPopover: true,
 		active: modifiers.active,
 		disabled: modifiers.disabled,
 		key: interval.int_id,
@@ -74,12 +74,14 @@ const IntervalSelection = ({value, onConfirm, intent, ...props} : EditableCell2P
 	}
 
 	const interval = useMemo(() => {
-		if(intervalValues.length == 0){
-			return null
-		} else {
-			return intervalValues.filter((interval) => interval.int_id == parseInt(localValue))[0]
+
+		let interval = null
+		if(intervalValues.length != 0){
+			interval = intervalValues.filter((interval) => interval.int_id == parseInt(value))[0]
 		}
-	}, [localValue, intervalValues])
+
+		return interval
+	}, [value, localValue, intervalValues])
 
 	useEffect(() => {
 
@@ -99,7 +101,7 @@ const IntervalSelection = ({value, onConfirm, intent, ...props} : EditableCell2P
 		...props,
 		style: {...props.style, padding: 0},
 	}, [
-		h(Select<Interval>, {
+		h(Select2<Interval>, {
 			fill: true,
 			items: intervalValues,
 			className: "update-input-group",

src/pages/maps/@id/edit/edit-page.ts

@@ -8,7 +8,7 @@ import { WidthAdjustablePanel } from "./components";
 import MapInterface from "./map-interface";
 import { useStoredState } from "@macrostrat/ui-components";
 import { ParentRouteButton } from "~/components/map-navbar";
-import { Button } from "@blueprintjs/core";
+import { Button, HotkeysProvider } from "@blueprintjs/core";
 
 export const h = hyper.styled(styles);
 
@@ -43,41 +43,43 @@ export default function EditInterface({
 
   const title = mapBounds.properties.name;
 
-  return h("div.edit-page", [
-    h(
-      WidthAdjustablePanel,
-      {
-        expand: !showMap,
-        className: "edit-page-content",
-        storageID: "edit-panel-width",
-      },
-      // TODO: make this basename dynamic
-      h([
-        h("div.edit-page-header", [
-          h(ParentRouteButton, { parentRoute: "/maps/" }),
-          h("h2", title),
-          h("div.spacer"),
-          h("div.edit-page-buttons", [
-            h(ShowMapButton, { showMap, setShowMap }),
+  return h(HotkeysProvider, [
+    h("div.edit-page", [
+      h(
+        WidthAdjustablePanel,
+        {
+          expand: !showMap,
+          className: "edit-page-content",
+          storageID: "edit-panel-width",
+        },
+        // TODO: make this basename dynamic
+        h([
+          h("div.edit-page-header", [
+            h(ParentRouteButton, { parentRoute: "/maps/" }),
+            h("h2", title),
+            h("div.spacer"),
+            h("div.edit-page-buttons", [
+              h(ShowMapButton, { showMap, setShowMap }),
+            ]),
           ]),
-        ]),
-        h(Router, { basename: `/maps/${source_id}/edit` }, [
-          h(Routes, [
-            h(Route, {
-              path: "",
-              element: h(EditMenu),
-            }),
-            h(Route, {
-              path: "polygons",
-              element: h(EditTable, {
-                url: `${import.meta.env.VITE_MACROSTRAT_INGEST_API}/sources/${source_id}/polygons`,
+          h(Router, { basename: `/maps/${source_id}/edit` }, [
+            h(Routes, [
+              h(Route, {
+                path: "",
+                element: h(EditMenu),
               }),
-            }),
-          ]),
-        ]),
-      ])
-    ),
-    h.if(showMap)(MapInterface, { id: source_id, map: mapBounds }),
+              h(Route, {
+                path: "polygons",
+                element: h(EditTable, {
+                  url: `${import.meta.env.VITE_MACROSTRAT_INGEST_API}/sources/${source_id}/polygons`,
+                }),
+              }),
+            ]),
+          ])
+        ])
+      ),
+      h.if(showMap)(MapInterface, { id: source_id, map: mapBounds }),
+    ]),
   ]);
 }