Skip to content

Commit

Permalink
fix: $refs.popper can be null initially
Browse files Browse the repository at this point in the history
  • Loading branch information
Akryum committed Aug 2, 2022
1 parent 5f08f6f commit 4c7f4b9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
4 changes: 2 additions & 2 deletions packages/floating-vue/src/components/Popper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default () => defineComponent({

referenceNode: {
type: Function,
required: true,
default: null,
},

popperNode: {
Expand Down Expand Up @@ -478,7 +478,7 @@ export default () => defineComponent({
this.$_preventShow = false

// Nodes
this.$_referenceNode = this.referenceNode()
this.$_referenceNode = this.referenceNode?.() ?? this.$el
this.$_targetNodes = this.targetNodes().filter(e => e.nodeType === e.ELEMENT_NODE)
this.$_popperNode = this.popperNode()
this.$_innerNode = this.$_popperNode.querySelector('.v-popper__inner')
Expand Down
3 changes: 1 addition & 2 deletions packages/floating-vue/src/components/PopperWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
}"
:theme="finalTheme"
:target-nodes="getTargetNodes"
:reference-node="() => $refs.popper.$el"
:popper-node="() => $refs.popperContent.$el"
:class="[
themeClass,
Expand Down Expand Up @@ -86,7 +85,7 @@ export default defineComponent({
methods: {
getTargetNodes () {
return Array.from(this.$refs.popper.$el.children)
return Array.from(this.$el.children)
.filter(node => node !== this.$refs.popperContent.$el)
},
},
Expand Down

0 comments on commit 4c7f4b9

Please sign in to comment.