fix warps display for greenfield & click action

zardoy · Mar 25, 2024 · 6997e78 · 6997e78
1 parent 501d353
commit 6997e78
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/loadSave.ts b/src/loadSave.ts
@@ -6,7 +6,7 @@ import { proxy } from 'valtio'
 import { gzip } from 'node-gzip'
 import { options } from './optionsStorage'
 import { nameToMcOfflineUUID, disconnect } from './flyingSquidUtils'
-import { forceCachedDataPaths, forceRedirectPaths, mkdirRecursive } from './browserfs'
+import { existsViaStats, forceCachedDataPaths, forceRedirectPaths, mkdirRecursive } from './browserfs'
 import { isMajorVersionGreater } from './utils'
 
 import { activeModalStacks, insertActiveModalStack, miscUiState } from './globalState'
@@ -154,7 +154,9 @@ export const loadSave = async (root = '/world') => {
   // improve compatibility with community saves
   const rootRemapFiles = ['Warp files']
   for (const rootRemapFile of rootRemapFiles) {
-    forceRedirectPaths[path.join(root, rootRemapFile)] = path.join(root, '..', rootRemapFile)
+    if (await existsViaStats(path.join(root, '..', rootRemapFile))) {
+      forceRedirectPaths[path.join(root, rootRemapFile)] = path.join(root, '..', rootRemapFile)
+    }
   }
 
   // todo reimplement

diff --git a/src/react/Notification.tsx b/src/react/Notification.tsx
@@ -36,7 +36,7 @@ export default ({ type = 'message', message, subMessage = '', open, icon = '', a
         position: 'fixed',
         top: 0,
         right: 0,
-        width: '160px',
+        width: '155px',
         whiteSpace: 'nowrap',
         fontSize: '9px',
         display: 'flex',
@@ -45,7 +45,7 @@ export default ({ type = 'message', message, subMessage = '', open, icon = '', a
         padding: '3px 8px',
         background: isError ? 'rgba(255, 0, 0, 0.7)' : 'rgba(0, 0, 0, 0.7)',
         borderRadius: '0 0 0 5px',
-        pointerEvents: action ? 'auto' : 'none',
+        pointerEvents: action ? '' : 'none',
         zIndex: 1200, // even above stats
         ...addStyles
       }}>

diff --git a/src/react/NotificationProvider.tsx b/src/react/NotificationProvider.tsx
@@ -40,7 +40,7 @@ export const hideNotification = () => {
 }
 
 export default () => {
-  const { autoHide, message, open, icon, type, subMessage } = useSnapshot(notificationProxy)
+  const { autoHide, message, open, icon, type, subMessage, action } = useSnapshot(notificationProxy)
 
   useEffect(() => {
     if (autoHide && open) {
@@ -58,6 +58,7 @@ export default () => {
   // }, [])
 
   return <Notification
+    action={action}
     type={type}
     message={message}
     subMessage={subMessage}