fix(vue3): state sync breaking after loading story 2nd time, fix #128

histoire-dev · Jun 22, 2022 · 58ecf07 · 58ecf07
1 parent 86e580f
commit 58ecf07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/histoire-plugin-vue/src/client/app/Variant.vue b/packages/histoire-plugin-vue/src/client/app/Variant.vue
@@ -42,7 +42,7 @@ export default defineComponent({
  const implicitState = inject<() => any>('implicitState')
 
  watch(() => implicitState, value => {
- applyStateToVariant(attrs.variant, value())
+ applyStateToVariant(attrs.variant, value(), true)
  }, {
  immediate: true,
  })

diff --git a/packages/histoire-shared/src/state.ts b/packages/histoire-shared/src/state.ts
@@ -24,10 +24,10 @@ export function omit (data, keys: string[]) {
  return copy
 }
 
-export function applyStateToVariant (variant: Variant, state: any) {
+export function applyStateToVariant (variant: Variant, state: any, override = false) {
  if (variant.state) {
  for (const key in state) {
- if (variant.state[key] && !key.startsWith('_h') && typeof variant.state[key] === 'object' && !Array.isArray(variant.state[key])) {
+ if (!override && variant.state[key] && !key.startsWith('_h') && typeof variant.state[key] === 'object' && !Array.isArray(variant.state[key])) {
  Object.assign(variant.state[key], state[key])
  } else {
  variant.state[key] = state[key]