x-block-lib 0.9.30 → 0.9.32

package/dist/core/utils/common/misc.d.ts

@@ -14,3 +14,5 @@ export declare function isRefNode(key: string): boolean;
 export declare function isMultipleRefNode(key: string): boolean;
 export declare function isSlotNode(key: string): boolean;
 export declare function isMultipleSlotNode(key: string): boolean;
+export declare function isEqualOfElementSlot(target: string, elementKey: string, slotKey: string): boolean;
+export declare function isEqualOfCustomSlot(target: string, compId: string, slotId: string): boolean;

package/dist/index.js

@@ -10,8 +10,8 @@
 pre code.hljs{padding:1em;display:block;overflow-x:auto}code.hljs{padding:3px 5px}.hljs{color:#444;background:#f3f3f3}.hljs-comment{color:#697070}.hljs-punctuation,.hljs-tag{color:#444a}.hljs-tag .hljs-attr,.hljs-tag .hljs-name{color:#444}.hljs-attribute,.hljs-doctag,.hljs-keyword,.hljs-meta .hljs-keyword,.hljs-name,.hljs-selector-tag{font-weight:700}.hljs-deletion,.hljs-number,.hljs-quote,.hljs-selector-class,.hljs-selector-id,.hljs-string,.hljs-template-tag,.hljs-type{color:#800}.hljs-section,.hljs-title{color:#800;font-weight:700}.hljs-link,.hljs-operator,.hljs-regexp,.hljs-selector-attr,.hljs-selector-pseudo,.hljs-symbol,.hljs-template-variable,.hljs-variable{color:#ab5656}.hljs-literal{color:#695}.hljs-addition,.hljs-built_in,.hljs-bullet,.hljs-code{color:#397300}.hljs-meta{color:#1f7199}.hljs-meta .hljs-string{color:#38a}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}.ghost[data-v-14e53948]{opacity:.4;pointer-events:none}.blocklyToolbox{width:56px;overflow-x:hidden}.blocklyMainBackground{stroke-width:0}.blocklyToolboxCategory{margin-bottom:12px!important}.blocklyToolboxCategoryIcon{display:none!important}.blocklyTreeRowContentContainer{place-items:center;height:28px;display:flex;overflow:hidden}.blocklyFlyout{z-index:21}
 /*$vite$:1*/`)),document.head.appendChild(e)}}catch(e){console.error(`vite-plugin-css-injected-by-js`,e)}})();import { A as Names, B as defineBlocksWithJsonArray, C as FieldCheckbox, D as FieldNumber, E as FieldLabel, F as Themes, G as inject$1, H as getMainWorkspace, I as Variables, J as serialization, K as inputs, L as WorkspaceSvg, M as ShortcutItems, N as ShortcutRegistry, O as FieldTextInput, P as Theme, Q as utils, R as Xml, S as Extensions, T as FieldImage, U as getSelected, V as dialog, W as icons, X as setParentContainer, Y as setLocale$1, Z as svgResize, _ as javascriptGenerator, a as lo, b as ContextMenuRegistry, c as require_dist, d as snakeCase_default, f as parseInt_default, g as Order, h as cloneDeep_default, i as require_dist$2, j as Procedures, k as Msg, l as encodeString, m as debounce_default, n as javascript, o as useResizeObserver, p as isEqual_default, q as registry, r as core_default, s as require_dist$1, t as highlightjs_vue_esm_min_default, u as upperCase_default, v as Blocks, w as FieldDropdown, x as Events, y as ContextMenu, z as common } from "./vendor.leasz44h.js";
 import { globalState } from "x-state-lib";
-import { eventBus, globalObjects, messageWarning, openConfirmDlg, openPromptDlg, useColor, useSystem, useViewStack } from "x-essential-lib";
 import { addIndent, finalProperties, getElement, getImplementMethodName, getTag, makeEventId, makeEventKeyOfCustomSlot, makeEventKeyOfElementSlot, makeMethodId, makeMethodKeyOfCustomSlot, makeMethodKeyOfElementSlot, makePropertyId, makePropertyKeyOfCustomSlot, makePropertyKeyOfElementSlot, makeTriggerId, parsePercentStr, parsePixelStr, pkgs, toEventName, toMethodName, toPropertyName, unwrapEventId, unwrapEventKeyOfCustomSlot, unwrapEventKeyOfElementSlot, unwrapMethodId, unwrapMethodKeyOfCustomSlot, unwrapMethodKeyOfElementSlot, unwrapPropertyId, unwrapPropertyKeyOfCustomSlot, unwrapPropertyKeyOfElementSlot, unwrapSlotId } from "x-runtime-lib";
+import { eventBus, globalObjects, messageWarning, openConfirmDlg, openPromptDlg, useColor, useSystem, useViewStack } from "x-essential-lib";
 import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, inject, isRef, mergeModels, mergeProps, nextTick, normalizeStyle, onBeforeUnmount, onMounted, onUnmounted, openBlock, provide, ref, renderList, renderSlot, resolveComponent, resolveDirective, toDisplayString, unref, useId, useModel, useTemplateRef, watch, withCtx, withDirectives, withKeys, withModifiers } from "vue";
 import { useDisplay } from "vuetify";
 import { useI18n } from "vue-i18n";
@@ -77,6 +77,14 @@ function isSlotNode(e) {
 function isMultipleSlotNode(e) {
 	return e.startsWith("multiple_slot_v");
 }
+function isEqualOfElementSlot(e, y, b) {
+	let { kind: x, mainKey: S, slotKey: C } = unwrapSlotId(e);
+	return !(x !== "elementSlot" && x !== "multipleElementSlot" || y !== S || b !== C);
+}
+function isEqualOfCustomSlot(e, y, b) {
+	let { kind: x, mainKey: S, slotKey: C } = unwrapSlotId(e);
+	return !(x !== "customSlot" && x !== "multipleCustomSlot" || y !== S || b !== C);
+}
 function blockOfTextV1(e) {
 	let y = `<block type="text_v1"><field name="TEXT">${e}</field></block>`;
 	return utils.xml.textToDom(y);
@@ -1071,18 +1079,18 @@ function getOnEventInfo(e) {
 		}
 	} else if (w === "elementAdaptSlotEvent") {
 		if (isGlobalityNode(O.key) && y.type === "comp" && D.adaptSlot) {
-			let { elementKey: y, slotKey: b, eventKey: x } = unwrapEventKeyOfElementSlot(E), { kind: S, mainKey: C, slotKey: w } = unwrapSlotId(D.adaptSlot);
-			if ((S === "elementSlot" || S === "multipleElementSlot") && y === C && b === w) {
-				let C = getElement(y);
-				if (C && C.slots) {
-					let y = C.slots.find((e) => e.key === b);
+			let { elementKey: y, slotKey: b, eventKey: x } = unwrapEventKeyOfElementSlot(E);
+			if (isEqualOfElementSlot(D.adaptSlot, y, b)) {
+				let S = getElement(y);
+				if (S && S.slots) {
+					let y = S.slots.find((e) => e.key === b);
 					if (y && y.events) {
 						let b = y.events.find((e) => e.key === x);
 						if (b) return {
 							id: e,
-							kind: S,
+							kind: w,
 							names: [
-								C.name,
+								S.name,
 								y.name,
 								b.name
 							],
@@ -1094,18 +1102,18 @@ function getOnEventInfo(e) {
 		}
 	} else if (w === "elementAdaptSlotPropertyChangeEvent") {
 		if (isGlobalityNode(O.key) && y.type === "comp" && D.adaptSlot) {
-			let { elementKey: y, slotKey: b, propertyKey: x } = unwrapPropertyKeyOfElementSlot(E), { kind: S, mainKey: C, slotKey: w } = unwrapSlotId(D.adaptSlot);
-			if ((S === "elementSlot" || S === "multipleElementSlot") && y === C && b === w) {
-				let C = getElement(y);
-				if (C && C.slots) {
-					let y = C.slots.find((e) => e.key === b);
+			let { elementKey: y, slotKey: b, propertyKey: x } = unwrapPropertyKeyOfElementSlot(E);
+			if (isEqualOfElementSlot(D.adaptSlot, y, b)) {
+				let S = getElement(y);
+				if (S && S.slots) {
+					let y = S.slots.find((e) => e.key === b);
 					if (y && y.properties) {
 						let b = y.properties.find((e) => e.key === x);
 						if (b) return {
 							id: e,
-							kind: S,
+							kind: w,
 							names: [
-								C.name,
+								S.name,
 								y.name,
 								b.name
 							],
@@ -1117,18 +1125,18 @@ function getOnEventInfo(e) {
 		}
 	} else if (w === "customAdaptSlotEvent") {
 		if (isGlobalityNode(O.key) && y.type === "comp" && D.adaptSlot) {
-			let { compId: y, slotId: b, eventId: x } = unwrapEventKeyOfCustomSlot(E), { kind: C, mainKey: w, slotKey: T } = unwrapSlotId(D.adaptSlot);
-			if ((C === "customSlot" || C === "multipleCustomSlot") && y === w && b === T) {
-				let w = S[y];
-				if (w && w.meta.slots) {
-					let y = w.meta.slots.find((e) => e.id === b);
+			let { compId: y, slotId: b, eventId: x } = unwrapEventKeyOfCustomSlot(E);
+			if (isEqualOfCustomSlot(D.adaptSlot, y, b)) {
+				let C = S[y];
+				if (C && C.meta.slots) {
+					let y = C.meta.slots.find((e) => e.id === b);
 					if (y && y.events) {
 						let b = y.events.find((e) => e.id === x);
 						if (b) return {
 							id: e,
-							kind: C,
+							kind: w,
 							names: [
-								w.name,
+								C.name,
 								y.name,
 								b.name
 							],
@@ -1140,18 +1148,18 @@ function getOnEventInfo(e) {
 		}
 	} else if (w === "customAdaptSlotPropertyChangeEvent") {
 		if (isGlobalityNode(O.key) && y.type === "comp" && D.adaptSlot) {
-			let { compId: y, slotId: b, propertyId: x } = unwrapPropertyKeyOfCustomSlot(E), { kind: C, mainKey: w, slotKey: T } = unwrapSlotId(D.adaptSlot);
-			if ((C === "customSlot" || C === "multipleCustomSlot") && y === w && b === T) {
-				let w = S[y];
-				if (w && w.meta.slots) {
-					let y = w.meta.slots.find((e) => e.id === b);
+			let { compId: y, slotId: b, propertyId: x } = unwrapPropertyKeyOfCustomSlot(E);
+			if (isEqualOfCustomSlot(D.adaptSlot, y, b)) {
+				let C = S[y];
+				if (C && C.meta.slots) {
+					let y = C.meta.slots.find((e) => e.id === b);
 					if (y && y.properties) {
 						let b = y.properties.find((e) => e.id === x);
 						if (b) return {
 							id: e,
-							kind: C,
+							kind: w,
 							names: [
-								w.name,
+								C.name,
 								y.name,
 								b.name
 							],
@@ -1463,8 +1471,8 @@ function getCallMethodInfo(e) {
 		}
 	} else if (S === "elementAdaptSlotMethod") {
 		if (isGlobalityNode(E.key) && y.type === "comp" && T.adaptSlot) {
-			let { elementKey: y, slotKey: b, methodKey: x } = unwrapMethodKeyOfElementSlot(w), { kind: S, mainKey: C, slotKey: E } = unwrapSlotId(T.adaptSlot);
-			if ((S === "elementSlot" || S === "multipleElementSlot") && y === C && b === E) {
+			let { elementKey: y, slotKey: b, methodKey: x } = unwrapMethodKeyOfElementSlot(w);
+			if (isEqualOfElementSlot(T.adaptSlot, y, b)) {
 				let C = getElement(y);
 				if (C && C.slots) {
 					let y = C.slots.find((e) => e.key === b);
@@ -1486,16 +1494,16 @@ function getCallMethodInfo(e) {
 			}
 		}
 	} else if (S === "customAdaptSlotMethod" && isGlobalityNode(E.key) && y.type === "comp" && T.adaptSlot) {
-		let { compId: y, slotId: b, methodId: S } = unwrapMethodKeyOfCustomSlot(w), { kind: C, mainKey: E, slotKey: D } = unwrapSlotId(T.adaptSlot);
-		if ((C === "customSlot" || C === "multipleCustomSlot") && y === E && b === D) {
+		let { compId: y, slotId: b, methodId: C } = unwrapMethodKeyOfCustomSlot(w);
+		if (isEqualOfCustomSlot(T.adaptSlot, y, b)) {
 			let w = x[y];
 			if (w && w.meta.slots) {
 				let y = w.meta.slots.find((e) => e.id === b);
 				if (y && y.methods) {
-					let b = y.methods.find((e) => e.id === S);
+					let b = y.methods.find((e) => e.id === C);
 					if (b) return {
 						id: e,
-						kind: C,
+						kind: S,
 						names: [
 							w.name,
 							y.name,
@@ -1854,18 +1862,18 @@ function getPropertyInfo(e) {
 		}
 	} else if (C === "elementAdaptSlotProperty") {
 		if (isGlobalityNode(D.key) && y.type === "comp" && E.adaptSlot) {
-			let { elementKey: y, slotKey: b, propertyKey: x } = unwrapPropertyKeyOfElementSlot(T), { kind: S, mainKey: C, slotKey: w } = unwrapSlotId(E.adaptSlot);
-			if ((S === "elementSlot" || S === "multipleElementSlot") && y === C && b === w) {
-				let C = getElement(y);
-				if (C && C.slots) {
-					let y = C.slots.find((e) => e.key === b);
+			let { elementKey: y, slotKey: b, propertyKey: x } = unwrapPropertyKeyOfElementSlot(T);
+			if (isEqualOfElementSlot(E.adaptSlot, y, b)) {
+				let S = getElement(y);
+				if (S && S.slots) {
+					let y = S.slots.find((e) => e.key === b);
 					if (y && y.properties) {
 						let b = y.properties.find((e) => e.key === x);
 						if (b) return {
 							id: e,
-							kind: S,
+							kind: C,
 							names: [
-								C.name,
+								S.name,
 								y.name,
 								b.name
 							],
@@ -1876,8 +1884,8 @@ function getPropertyInfo(e) {
 			}
 		}
 	} else if (C === "customAdaptSlotProperty" && isGlobalityNode(D.key) && y.type === "comp" && E.adaptSlot) {
-		let { compId: y, slotId: b, propertyId: S } = unwrapPropertyKeyOfCustomSlot(T), { kind: C, mainKey: w, slotKey: D } = unwrapSlotId(E.adaptSlot);
-		if ((C === "customSlot" || C === "multipleCustomSlot") && y === w && b === D) {
+		let { compId: y, slotId: b, propertyId: S } = unwrapPropertyKeyOfCustomSlot(T);
+		if (isEqualOfCustomSlot(E.adaptSlot, y, b)) {
 			let w = x[y];
 			if (w && w.meta.slots) {
 				let y = w.meta.slots.find((e) => e.id === b);
@@ -1985,12 +1993,13 @@ Blocks.app_bind_container_v1 = { init: function() {
 			b.push(y.valueConnection_), y = y.getNextBlock();
 		}
 		for (let e = 0; e < this.itemCount_; e++) {
+			this.getInput("ADD" + e).setShadowDom(null);
 			let y = this.getInput("ADD" + e).connection.targetConnection;
 			y && !b.includes(y) && y.disconnect();
 		}
-		this.itemCount_ = b.length, this.updateShape_(), this.updateShadow_();
+		this.itemCount_ = b.length, this.updateShape_();
 		for (let e = 0; e < this.itemCount_; e++) b[e]?.reconnect(this, "ADD" + e);
-		setTimeout(() => {
+		this.updateShadow_(), setTimeout(() => {
 			this.checkWarning_();
 		}, 0);
 	},
@@ -2014,7 +2023,7 @@ Blocks.app_bind_container_v1 = { init: function() {
 		for (let e = this.itemCount_; this.getInput("ADD" + e); e++) this.removeInput("ADD" + e);
 	},
 	updateShadow_: function() {
-		if (!this.isInsertionMarker()) for (let e = 0; e < this.itemCount_; e++) this.getInput("ADD" + e).setCheck("BindEntry").setShadowDom(shadowOfAppBindEntryV1());
+		if (!this.isInsertionMarker()) for (let e = 0; e < this.itemCount_; e++) this.getInput("ADD" + e).setShadowDom(shadowOfAppBindEntryV1());
 	},
 	checkWarning_: function() {
 		let e;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "x-block-lib",
   "private": false,
-  "version": "0.9.30",
+  "version": "0.9.32",
   "type": "module",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -41,7 +41,7 @@
   },
   "peerDependencies": {
     "x-essential-lib": "^0.9.24",
-    "x-runtime-lib": "^0.8.204",
+    "x-runtime-lib": "^0.8.207",
     "x-state-lib": "^0.3.38"
   },
   "devDependencies": {