fix: Add rootId into expand key

vuejs · Jan 2, 2024 · 8281d51 · 8281d51
1 parent a34c3d9
commit 8281d51
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/packages/client/src/components/inspector/InspectorState.vue b/packages/client/src/components/inspector/InspectorState.vue
@@ -31,5 +31,5 @@ createStateEditorContext({
       {{ name }}
     </span>
   </div>
-  <InspectorStateType v-if="isExpanded" :data="data" />
+  <InspectorStateType v-if="isExpanded" :data="data" :root-id="id" />
 </template>
diff --git a/packages/client/src/components/inspector/InspectorStateField.vue b/packages/client/src/components/inspector/InspectorStateField.vue
@@ -10,6 +10,7 @@ const props = withDefaults(defineProps<{
   data: InspectorState
   depth?: number
   no: number
+  rootId: string
 }>(), {
   depth: 0,
 })
@@ -26,7 +27,7 @@ const stateFormatClass = computed(() => {
     return ``
 })
 
-const { isExpanded, toggleCollapse } = useCollapse('inspector-state', `${props.no}-${props.depth}-${props.data.key}`)
+const { isExpanded, toggleCollapse } = useCollapse('inspector-state', `${props.rootId}-${props.no}-${props.depth}-${props.data.key}`)
 
 const normalizedValue = computed(() => {
   const stateTypeName = (props.data as InspectorCustomState)._custom?.stateTypeName || props.data?.stateTypeName
@@ -208,7 +209,7 @@ const { isHovering } = useHover(containerRef)
         </div>
         <div v-if="isExpanded">
           <InspectorStateField
-            v-for="(field, index) in normalizedChildField" :key="index" :data="field" :depth="depth + 1" :no="no"
+            v-for="(field, index) in normalizedChildField" :key="index" :data="field" :depth="depth + 1" :no="no" :root-id="rootId"
           />
           <div v-if="draftingNewProp.enable" :style="{ paddingLeft: `${(depth + 1) * 15 + 4}px` }">
             <span overflow-hidden text-ellipsis whitespace-nowrap state-key>

diff --git a/packages/client/src/components/inspector/InspectorStateType.vue b/packages/client/src/components/inspector/InspectorStateType.vue
@@ -4,6 +4,7 @@ import type { InspectorState } from '@vue/devtools-kit'
 withDefaults(defineProps<{
   data: InspectorState[]
   depth?: number
+  rootId: string
 }>(), {
   depth: 0,
 })
@@ -14,6 +15,6 @@ withDefaults(defineProps<{
     v-for="(item, index) in data"
     :key="index" class="flex items-center pl-8 font-data-field"
   >
-    <InspectorStateField :data="item" :no="index" />
+    <InspectorStateField :data="item" :no="index" :root-id="rootId" />
   </div>
 </template>