Merge branch 'dev' into glueball-nix

Author: PepperLola

.github/dependabot.yml

@@ -5,3 +5,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "nix"
+    directory: "/"
+    schedule:
+      interval: "weekly"

fission/public/assetpack.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:929579b2dc87cffb6b5236f054a6b1ffcb17f0a384f4262f58fd2cb99fdc48ac
-size 41776301
+oid sha256:2213eb7905d6fe15beb5fca656065c248da0c4f4b7630ced943bb5cf4a32c3fb
+size 43082276

fission/src/ui/UIProvider.tsx

@@ -2,6 +2,7 @@ import CloseIcon from "@mui/icons-material/Close"
 import type { SnackbarKey, SnackbarMessage, VariantType } from "notistack"
 import { useSnackbar } from "notistack"
 import type React from "react"
+import { useRef } from "react"
 import { useMemo } from "react"
 import type { FunctionComponent, ReactNode } from "react"
 import { Fragment, useCallback, useReducer, useState } from "react"
@@ -120,6 +121,9 @@ export const UIProvider: React.FC<UIProviderProps> = ({ children }) => {
         }
     }, [refreshDep, panels])
 
+    const blockStateRef = useRef<UIBlockState>(blockState)
+    blockStateRef.current = blockState
+
     const openModal: OpenModalFn = useCallback(
         <T, P>(
             content: FunctionComponent<ModalImplProps<T, P>>,
@@ -128,8 +132,8 @@ export const UIProvider: React.FC<UIProviderProps> = ({ children }) => {
             props: Omit<ModalProps<P>, "type" | "configured" | "custom"> &
                 Omit<UIScreenCallbacks<T>, "onBeforeAccept"> = DEFAULT_PROPS
         ) => {
-            if (blockState.blocked) {
-                addToast("warning", blockState.blockMessage)
+            if (blockStateRef.current.blocked) {
+                addToast("warning", blockStateRef.current.blockMessage)
                 return null
             }
 
@@ -163,7 +167,7 @@ export const UIProvider: React.FC<UIProviderProps> = ({ children }) => {
             setModal(newModal as Modal<any, any>)
             return id
         },
-        [modal, blockState]
+        [modal]
     )
 
     const snackbarAction = useCallback(
@@ -215,8 +219,8 @@ export const UIProvider: React.FC<UIProviderProps> = ({ children }) => {
             }
 
             // if any (generic) open panel declares itself as blocking, prevent opening a new one
-            if (blockState.blocked) {
-                addToast("warning", blockState.blockMessage)
+            if (blockStateRef.current.blocked) {
+                addToast("warning", blockStateRef.current.blockMessage)
                 return null
             }
 
@@ -252,7 +256,7 @@ export const UIProvider: React.FC<UIProviderProps> = ({ children }) => {
             })
             return id
         },
-        [panels, addToast, blockState]
+        [panels, addToast]
     )
 
     const closeModal = useCallback(
@@ -309,15 +313,18 @@ export const UIProvider: React.FC<UIProviderProps> = ({ children }) => {
             if ("exclusiveGroup" in screen.props) {
                 const exclusiveGroup = screen.props.exclusiveGroup
                 if (exclusiveGroup != null) {
-                    const existing = panels.find(p => p.props.exclusiveGroup == exclusiveGroup && p !== screen)
-                    if (existing) {
-                        closePanel(existing.id, CloseType.OVERWRITE)
-                    }
+                    setPanels(panels => {
+                        const existing = panels.find(p => p.props.exclusiveGroup == exclusiveGroup && p !== screen)
+                        if (existing) {
+                            closePanel(existing.id, CloseType.OVERWRITE)
+                        }
+                        return panels
+                    })
                 }
             }
             refresh()
         },
-        [closePanel, panels]
+        [closePanel]
     )
 
     return (

fission/src/ui/panels/configuring/assembly-config/ConfigurePanel.tsx

@@ -341,8 +341,7 @@ const ConfigurePanel: React.FC<PanelImplProps<void, ConfigurePanelCustomProps>>
                             pendingDeletes={pendingDeletes}
                         />
 
-                        {configMode === undefined &&
-                            selectedAssembly !== undefined &&
+                        {selectedAssembly !== undefined &&
                             (!selectedAssembly.isOwnObject ? (
                                 <Label size={"sm"}>Cannot configure someone else's object</Label>
                             ) : (
@@ -360,13 +359,13 @@ const ConfigurePanel: React.FC<PanelImplProps<void, ConfigurePanelCustomProps>>
                                     {ConfigSubPanel != null && (
                                         <ConfigSubPanel
                                             panel={panel!}
-                                            selectedAssembly={selectedAssembly!}
+                                            selectedAssembly={selectedAssembly}
                                             setDisableAccept={setDisableAccept}
                                             hasMadeChanges={hasMadeChanges}
                                             registerCleanupFunction={registerCleanupFunctions}
                                         />
                                     )}
-                                    {
+                                    {configMode === undefined && (
                                         <>
                                             <Spacer height={16} />
                                             <AssemblyExportButton selectedAssembly={selectedAssembly} />
@@ -388,7 +387,7 @@ const ConfigurePanel: React.FC<PanelImplProps<void, ConfigurePanelCustomProps>>
                                                 <FaArrowsRotate />
                                             </Button>
                                         </>
-                                    }
+                                    )}
                                 </>
                             ))}
                     </>