@cabloy/vue-runtime-core 3.5.24 → 3.5.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/runtime-core.cjs.js
CHANGED
|
@@ -7735,6 +7735,8 @@ function mergeProps(...args) {
|
|
|
7735
7735
|
const incoming = toMerge[key];
|
|
7736
7736
|
if (incoming && existing !== incoming && !(shared.isArray(existing) && existing.includes(incoming))) {
|
|
7737
7737
|
ret[key] = existing ? [].concat(existing, incoming) : incoming;
|
|
7738
|
+
} else if (existing === void 0 || incoming === null || incoming === false) {
|
|
7739
|
+
ret[key] = incoming;
|
|
7738
7740
|
}
|
|
7739
7741
|
} else if (key !== "") {
|
|
7740
7742
|
ret[key] = toMerge[key];
|
|
@@ -7834,6 +7836,9 @@ function createComponentInstance(vnode, parent, suspense) {
|
|
|
7834
7836
|
{
|
|
7835
7837
|
instance.ctx = createDevRenderContext(instance);
|
|
7836
7838
|
}
|
|
7839
|
+
if (vnode.zovaHostProviders) {
|
|
7840
|
+
instance.zovaHostProviders = vnode.zovaHostProviders;
|
|
7841
|
+
}
|
|
7837
7842
|
instance.root = parent ? parent.root : instance;
|
|
7838
7843
|
instance.emit = emit.bind(null, instance);
|
|
7839
7844
|
if (vnode.ce) {
|
|
@@ -6213,6 +6213,8 @@ function mergeProps(...args) {
|
|
|
6213
6213
|
const incoming = toMerge[key];
|
|
6214
6214
|
if (incoming && existing !== incoming && !(shared.isArray(existing) && existing.includes(incoming))) {
|
|
6215
6215
|
ret[key] = existing ? [].concat(existing, incoming) : incoming;
|
|
6216
|
+
} else if (existing === void 0 || incoming === null || incoming === false) {
|
|
6217
|
+
ret[key] = incoming;
|
|
6216
6218
|
}
|
|
6217
6219
|
} else if (key !== "") {
|
|
6218
6220
|
ret[key] = toMerge[key];
|
|
@@ -6312,6 +6314,9 @@ function createComponentInstance(vnode, parent, suspense) {
|
|
|
6312
6314
|
{
|
|
6313
6315
|
instance.ctx = { _: instance };
|
|
6314
6316
|
}
|
|
6317
|
+
if (vnode.zovaHostProviders) {
|
|
6318
|
+
instance.zovaHostProviders = vnode.zovaHostProviders;
|
|
6319
|
+
}
|
|
6315
6320
|
instance.root = parent ? parent.root : instance;
|
|
6316
6321
|
instance.emit = emit.bind(null, instance);
|
|
6317
6322
|
if (vnode.ce) {
|
|
@@ -7792,6 +7792,8 @@ function mergeProps(...args) {
|
|
|
7792
7792
|
const incoming = toMerge[key];
|
|
7793
7793
|
if (incoming && existing !== incoming && !(isArray(existing) && existing.includes(incoming))) {
|
|
7794
7794
|
ret[key] = existing ? [].concat(existing, incoming) : incoming;
|
|
7795
|
+
} else if (existing === void 0 || incoming === null || incoming === false) {
|
|
7796
|
+
ret[key] = incoming;
|
|
7795
7797
|
}
|
|
7796
7798
|
} else if (key !== "") {
|
|
7797
7799
|
ret[key] = toMerge[key];
|
|
@@ -7893,6 +7895,9 @@ function createComponentInstance(vnode, parent, suspense) {
|
|
|
7893
7895
|
} else {
|
|
7894
7896
|
instance.ctx = { _: instance };
|
|
7895
7897
|
}
|
|
7898
|
+
if (vnode.zovaHostProviders) {
|
|
7899
|
+
instance.zovaHostProviders = vnode.zovaHostProviders;
|
|
7900
|
+
}
|
|
7896
7901
|
instance.root = parent ? parent.root : instance;
|
|
7897
7902
|
instance.emit = emit.bind(null, instance);
|
|
7898
7903
|
if (vnode.ce) {
|