@plitzi/sdk-style 0.38.6 → 0.38.8

package/dist/components/StyleInspector/StyleInspectorProvider.mjs

@@ -4,90 +4,93 @@ import { useCallback as n, useMemo as r } from "react";
 import { useCommonStore as i } from "@plitzi/sdk-shared/store";
 import { emptyObject as a } from "@plitzi/sdk-shared/helpers/utils";
 import { get as o, omit as s } from "@plitzi/plitzi-ui/helpers";
-import { jsx as c } from "react/jsx-runtime";
-import { baseDefaultValue as l } from "@plitzi/sdk-shared";
+import { styleTargetRules as c } from "@plitzi/sdk-shared/style/styleTarget";
+import { jsx as l } from "react/jsx-runtime";
+import { baseDefaultValue as u } from "@plitzi/sdk-shared";
 //#region src/components/StyleInspector/StyleInspectorProvider.tsx
-var u = ({ children: u, componentType: d, selector: f, styleSelector: p = "base", styleState: m, styleVariant: h, styleAncestor: g, element: _, inheritData: v, displayMode: y, onChange: b }) => {
-	let x = t({ element: _ }), [S = a] = i("runtime.sources.variables"), C = n(() => {
-		let e;
-		if (f && p && f.attributes[p]) {
-			let t = f.attributes[p];
-			if (g) {
-				let n = t.ancestors?.[g], r = h ? n?.variants?.[h] : void 0, i = h ? r : n;
-				e = (m ? i?.states?.[m] : i?.default) ?? {};
-			} else e = m && h ? t.variants?.[h].states?.[m] ?? {} : h ? t.variants?.[h]?.default ?? {} : m ? t.states?.[m] ?? {} : t.default ?? {};
-		} else e = {};
-		return e;
-	}, [
-		f,
+var d = ({ children: d, componentType: f, selector: p, styleSelector: m = "base", styleState: h, styleVariant: g, styleAncestor: _, stylePseudo: v, styleCondition: y, element: b, inheritData: x, displayMode: S, onChange: C }) => {
+	let w = t({ element: b }), [T = a] = i("runtime.sources.variables"), E = n(() => c(p?.attributes[m], {
+		styleState: h,
+		styleVariant: g,
+		styleAncestor: _,
+		stylePseudo: v,
+		styleCondition: y
+	}) ?? {}, [
 		p,
 		m,
 		h,
-		g
-	]), w = n((e, t) => {
-		if (!(e && typeof t != "string" && typeof t != "number" && t !== void 0 || !e && typeof t != "object" && t !== void 0 || e && o(x, e))) {
-			if (!e && t && typeof t == "object" && (t = s(t, Object.keys(x))), !e && f && typeof t == "object") {
+		g,
+		_,
+		v,
+		y
+	]), D = n((e, t) => {
+		if (!(e && typeof t != "string" && typeof t != "number" && t !== void 0 || !e && typeof t != "object" && t !== void 0 || e && o(w, e))) {
+			if (!e && t && typeof t == "object" && (t = s(t, Object.keys(w))), !e && p && typeof t == "object") {
 				let e = {
-					...C(),
+					...E(),
 					...t
 				};
 				Object.keys(e).forEach((t) => {
 					e[t] === void 0 && delete e[t];
 				}), t = e;
 			}
-			b?.(e, t);
+			C?.(e, t);
 		}
 	}, [
-		x,
+		w,
+		E,
 		C,
-		b,
-		f
-	]), T = n((e) => Array.isArray(e) ? e.reduce((e, t) => ({
+		p
+	]), O = n((e) => Array.isArray(e) ? e.reduce((e, t) => ({
 		...e,
-		[t]: o(l, t)
-	}), {}) : e ? o(l, e) : l, []), E = n((e) => {
+		[t]: o(u, t)
+	}), {}) : e ? o(u, e) : u, []), k = n((e) => {
 		if (Array.isArray(e)) {
 			let t = e.reduce((e, t) => ({
 				...e,
 				[t]: void 0
 			}), {});
-			w(void 0, t);
-		} else w(e);
-	}, [w]), D = r(() => ({
-		componentType: d,
-		selector: f,
-		styleSelector: p,
-		styleState: m,
-		styleVariant: h,
-		styleAncestor: g,
-		displayMode: y,
-		variables: S,
-		inheritData: v.style,
-		bindingData: x,
-		getValues: C,
-		setValue: w,
-		resetValue: E,
-		getDefaultValue: T
+			D(void 0, t);
+		} else D(e);
+	}, [D]), A = r(() => ({
+		componentType: f,
+		selector: p,
+		styleSelector: m,
+		styleState: h,
+		styleVariant: g,
+		styleAncestor: _,
+		stylePseudo: v,
+		styleCondition: y,
+		displayMode: S,
+		variables: T,
+		inheritData: x.style,
+		bindingData: w,
+		getValues: E,
+		setValue: D,
+		resetValue: k,
+		getDefaultValue: O
 	}), [
-		d,
 		f,
 		p,
 		m,
 		h,
 		g,
+		_,
+		v,
 		y,
 		S,
-		v.style,
-		x,
-		C,
+		T,
+		x.style,
 		w,
 		E,
-		T
+		D,
+		k,
+		O
 	]);
-	return /* @__PURE__ */ c(e, {
-		value: D,
-		children: u
+	return /* @__PURE__ */ l(e, {
+		value: A,
+		children: d
 	});
 };
 //#endregion
-export { u as default };
+export { d as default };

package/dist/components/StyleInspector/components/AncestorRules/AncestorRuleChip.mjs

@@ -1,39 +1,40 @@
-import { memo as e, useCallback as t } from "react";
-import { jsx as n, jsxs as r } from "react/jsx-runtime";
-import i from "clsx";
-var a = e(({ condition: e, active: a = !1, unused: o = !1, onSelect: s, onRemove: c }) => {
-	let l = t(() => s?.(e), [e, s]), u = t(() => c?.(e), [e, c]), d = o ? `No element this selector dresses sits inside .${e.ancestor}, so this rule never matches` : `Edit the rules for inside .${e.ancestor} (${e.label})`;
-	return /* @__PURE__ */ r("div", {
-		className: i("flex max-w-full items-center overflow-hidden rounded-sm border text-[11px] leading-none", {
-			"border-primary-500 bg-primary-500/15 text-primary-700 dark:text-primary-200": a,
-			"border-amber-500/70 bg-amber-500/10 text-amber-700 dark:text-amber-300": o && !a,
-			"border-gray-300 bg-gray-100 text-zinc-600 dark:border-zinc-600 dark:bg-zinc-800 dark:text-zinc-300": !o && !a
+import { ancestorName as e } from "../../helpers.mjs";
+import { memo as t, useCallback as n } from "react";
+import { jsx as r, jsxs as i } from "react/jsx-runtime";
+import a from "clsx";
+var o = t(({ condition: t, active: o = !1, unused: s = !1, onSelect: c, onRemove: l }) => {
+	let u = n(() => c?.(t), [t, c]), d = n(() => l?.(t), [t, l]), f = e(t.ancestor), p = s ? `No element this selector dresses sits inside ${f}, so this rule never matches` : `Edit the rules for inside ${f} (${t.label})`;
+	return /* @__PURE__ */ i("div", {
+		className: a("flex max-w-full items-center overflow-hidden rounded-sm border text-[11px] leading-none", {
+			"border-primary-500 bg-primary-500/15 text-primary-700 dark:text-primary-200": o,
+			"border-amber-500/70 bg-amber-500/10 text-amber-700 dark:text-amber-300": s && !o,
+			"border-gray-300 bg-gray-100 text-zinc-600 dark:border-zinc-600 dark:bg-zinc-800 dark:text-zinc-300": !s && !o
 		}),
-		children: [/* @__PURE__ */ r("button", {
+		children: [/* @__PURE__ */ i("button", {
 			type: "button",
 			className: "flex min-w-0 items-center gap-1 px-1.5 py-1",
-			title: d,
-			onClick: l,
+			title: p,
+			onClick: u,
 			children: [
-				o && /* @__PURE__ */ n("i", { className: "fas fa-triangle-exclamation" }),
+				s && /* @__PURE__ */ r("i", { className: "fas fa-triangle-exclamation" }),
 				/* @__PURE__ */ r("span", {
 					className: "truncate",
-					children: [".", e.ancestor]
+					children: f
 				}),
-				/* @__PURE__ */ r("span", {
+				/* @__PURE__ */ i("span", {
 					className: "opacity-70",
-					children: ["· ", e.label]
+					children: ["· ", t.label]
 				})
 			]
-		}), /* @__PURE__ */ n("button", {
+		}), /* @__PURE__ */ r("button", {
 			type: "button",
 			className: "cursor-pointer border-l border-inherit px-1.5 py-1 hover:bg-red-500/15 hover:text-red-600 dark:hover:text-red-400",
 			title: "Remove this rule",
-			"aria-label": `Remove the ${e.label} rule under .${e.ancestor}`,
-			onClick: u,
-			children: /* @__PURE__ */ n("i", { className: "fas fa-xmark" })
+			"aria-label": `Remove the ${t.label} rule under ${f}`,
+			onClick: d,
+			children: /* @__PURE__ */ r("i", { className: "fas fa-xmark" })
 		})]
 	});
 });
 //#endregion
-export { a as default };
+export { o as default };

package/dist/components/StyleInspector/helpers.d.ts

@@ -1,7 +1,17 @@
 import { Option } from '@plitzi/plitzi-ui/Select2';
-import { DisplayMode, Element, Schema, Style, StyleAncestors, StyleItem, StyleState } from '@plitzi/sdk-shared';
+import { DisplayMode, Element, Schema, Style, StyleAncestors, StyleBlock, StyleItem, StyleState } from '@plitzi/sdk-shared';
 /** The states a selector can react to, as the state picker offers them — from the one list every layer reads. */
 export declare const STYLE_STATE_OPTIONS: Option[];
+/** How an ancestor key reads in the inspector: its class, or the parent it stands for. */
+export declare const ancestorName: (ancestor: string) => string;
+/** The pseudo-element picker's options, the ones the block already dresses saying so. */
+export declare const pseudoOptions: (block?: StyleBlock) => Option[];
+/**
+ * The condition picker's options: reduced motion and its opposite, then every container query the block already holds.
+ * A new container query is typed in (`container (max-width: 30rem)`) and kept only in the spelling
+ * `canonicalCondition` reads.
+ */
+export declare const conditionOptions: (block?: StyleBlock) => Option[];
 /**
  * The classes an element's ancestors carry, closest first: what an "ancestor" condition can name. Only the base slot
  * counts — a slot's class sits on an inner node of that ancestor, not around the element.

package/dist/components/StyleInspector/helpers.mjs

@@ -1,9 +1,17 @@
-import { STYLE_STATES as e, STYLE_STATE_LABELS as t, inCascadeOrder as n, isKnownState as r } from "@plitzi/sdk-shared/style/styleStates";
+import { STYLE_MOTION_CONDITIONS as e, conditionLabel as t } from "@plitzi/sdk-shared/style/styleConditions";
+import { STYLE_PSEUDOS as n, STYLE_PSEUDO_LABELS as r } from "@plitzi/sdk-shared/style/stylePseudos";
+import { PARENT_ANCESTOR as i, STYLE_STATES as a, STYLE_STATE_LABELS as o, inCascadeOrder as s, isKnownState as c, isParentAncestor as l } from "@plitzi/sdk-shared/style/styleStates";
 //#region src/components/StyleInspector/helpers.ts
-var i = e.map((e) => ({
-	label: t[e],
+var u = a.map((e) => ({
+	label: o[e],
 	value: e
-})), a = (e, t) => {
+})), d = (e) => l(e) ? "the element around it" : `.${e}`, f = (e) => n.map((t) => ({
+	label: e?.pseudos?.[t] ? `${r[t]} (set)` : r[t],
+	value: t
+})), p = (n) => [.../* @__PURE__ */ new Set([...e, ...Object.keys(n?.conditions ?? {})])].map((e) => ({
+	label: n?.conditions?.[e] ? `${t(e)} (set)` : t(e),
+	value: e
+})), m = (e, t) => {
 	let n = /* @__PURE__ */ new Set(), r = t?.definition.parentId, i = r ? e[r] : void 0;
 	for (; i;) {
 		for (let e of i.definition.styleSelectors.base.split(" ")) e && n.add(e);
@@ -11,44 +19,48 @@ var i = e.map((e) => ({
 		i = t ? e[t] : void 0;
 	}
 	return [...n];
-}, o = (e) => !!e && Object.keys(e).length > 0, s = (e) => n(e ?? {}).filter(([, e]) => o(e)).map(([e]) => e).filter(r), c = (e = {}) => Object.entries(e).flatMap(([e, { default: t, states: n, variants: r }]) => [
-	...o(t) ? [{
+}, h = (e) => !!e && Object.keys(e).length > 0, g = (e) => s(e ?? {}).filter(([, e]) => h(e)).map(([e]) => e).filter(c), _ = (e = {}) => Object.entries(e).flatMap(([e, { default: t, states: n, variants: r }]) => [
+	...h(t) ? [{
 		ancestor: e,
 		label: "inside"
 	}] : [],
-	...s(n).map((t) => ({
+	...g(n).map((t) => ({
 		ancestor: e,
 		state: t,
 		label: t
 	})),
-	...Object.entries(r ?? {}).flatMap(([t, n]) => [...o(n.default) ? [{
+	...Object.entries(r ?? {}).flatMap(([t, n]) => [...h(n.default) ? [{
 		ancestor: e,
 		variant: t,
 		label: t
-	}] : [], ...s(n.states).map((n) => ({
+	}] : [], ...g(n.states).map((n) => ({
 		ancestor: e,
 		variant: t,
 		state: n,
 		label: `${t}:${n}`
 	}))])
-]), l = (e, t = {}) => {
-	let n = c(t);
-	return [.../* @__PURE__ */ new Set([...e, ...Object.keys(t)])].map((e) => {
-		let t = n.filter((t) => t.ancestor === e).map((e) => e.label);
+]), v = (e, t = {}) => {
+	let n = _(t);
+	return [.../* @__PURE__ */ new Set([
+		i,
+		...e,
+		...Object.keys(t)
+	])].map((e) => {
+		let t = n.filter((t) => t.ancestor === e).map((e) => e.label), r = d(e);
 		return {
-			label: t.length ? `.${e} — ${t.join(", ")}` : `.${e}`,
+			label: t.length ? `${r} — ${t.join(", ")}` : r,
 			value: e
 		};
 	});
-}, u = (e, t) => Object.values(e).filter((e) => t.type === "element" ? e.definition.type === (t.componentType ?? t.name) : Object.values(e.definition.styleSelectors).some((e) => e.split(" ").includes(t.name))), d = (e, t) => {
-	let n = new Set(Object.values(t.attributes).flatMap((e) => Object.keys(e.ancestors ?? {})));
+}, y = (e, t) => Object.values(e).filter((e) => t.type === "element" ? e.definition.type === (t.componentType ?? t.name) : Object.values(e.definition.styleSelectors).some((e) => e.split(" ").includes(t.name))), b = (e, t) => {
+	let n = new Set(Object.values(t.attributes).flatMap((e) => Object.keys(e.ancestors ?? {})).filter((e) => !l(e)));
 	if (!n.size) return n;
-	for (let r of u(e, t)) if (a(e, r).forEach((e) => n.delete(e)), !n.size) break;
+	for (let r of y(e, t)) if (m(e, r).forEach((e) => n.delete(e)), !n.size) break;
 	return n;
-}, f = (e, t, n) => Object.keys(e).flatMap((r) => Object.entries(e[r][t]?.attributes ?? {}).flatMap(([e, t]) => Object.keys(t.ancestors ?? {}).filter((e) => n.has(e)).map((t) => ({
+}, x = (e, t, n) => Object.keys(e).flatMap((r) => Object.entries(e[r][t]?.attributes ?? {}).flatMap(([e, t]) => Object.keys(t.ancestors ?? {}).filter((e) => n.has(e)).map((t) => ({
 	displayMode: r,
 	styleSelector: e,
 	styleAncestor: t
 }))));
 //#endregion
-export { i as STYLE_STATE_OPTIONS, a as ancestorClasses, c as ancestorConditions, l as ancestorOptions, f as ancestorRemovals, d as unusedAncestors };
+export { u as STYLE_STATE_OPTIONS, m as ancestorClasses, _ as ancestorConditions, d as ancestorName, v as ancestorOptions, x as ancestorRemovals, p as conditionOptions, f as pseudoOptions, b as unusedAncestors };

package/dist/components/StyleInspector/hooks/useStyleInherit.d.ts

@@ -1,4 +1,4 @@
-import { Element, StyleState } from '@plitzi/sdk-shared';
+import { Element, StylePseudo, StyleState } from '@plitzi/sdk-shared';
 export type UseStyleInheritProps = {
     element?: Element;
     componentType?: string;
@@ -8,6 +8,8 @@ export type UseStyleInheritProps = {
     styleState?: StyleState;
     styleVariant?: string;
     styleAncestor?: string;
+    stylePseudo?: StylePseudo;
+    styleCondition?: string;
 };
-declare const useStyleInherit: ({ element, componentType, componentSubType, selector, styleSelector, styleState, styleVariant, styleAncestor }: UseStyleInheritProps) => import('../../..').InheritData;
+declare const useStyleInherit: ({ element, componentType, componentSubType, selector, styleSelector, styleState, styleVariant, styleAncestor, stylePseudo, styleCondition }: UseStyleInheritProps) => import('../../..').InheritData;
 export default useStyleInherit;

package/dist/components/StyleInspector/hooks/useStyleInherit.mjs

@@ -3,16 +3,18 @@ import { use as t, useMemo as n } from "react";
 import { useBuilderStore as r } from "@plitzi/sdk-shared/store";
 import i from "@plitzi/sdk-shared/elements/ComponentContext";
 //#region src/components/StyleInspector/hooks/useStyleInherit.ts
-var a = ({ element: a, componentType: o, componentSubType: s, selector: c, styleSelector: l = "base", styleState: u, styleVariant: d, styleAncestor: f }) => {
-	let [[p, m]] = r(["schema.flat", "style.platform"]), { componentDefinitions: h } = t(i);
+var a = ({ element: a, componentType: o, componentSubType: s, selector: c, styleSelector: l = "base", styleState: u, styleVariant: d, styleAncestor: f, stylePseudo: p, styleCondition: m }) => {
+	let [[h, g]] = r(["schema.flat", "style.platform"]), { componentDefinitions: _ } = t(i);
 	return n(() => {
 		let t = [], n = [], r = (a?.definition.styleSelectors[l] ?? "").split(" ");
-		return c && r.length > 1 && t.push(c), e(a, o, p, m, h.current, {
+		return c && r.length > 1 && t.push(c), e(a, o, h, g, _.current, {
 			componentSubType: s,
 			styleSelector: l,
 			styleState: u,
 			styleVariant: d,
 			styleAncestor: f,
+			stylePseudo: p,
+			styleCondition: m,
 			includeSelf: r.length > 1,
 			skipSelectors: t,
 			addSelectors: n
@@ -22,13 +24,15 @@ var a = ({ element: a, componentType: o, componentSubType: s, selector: c, style
 		l,
 		c,
 		o,
-		p,
-		m,
 		h,
+		g,
+		_,
 		s,
 		u,
 		d,
-		f
+		f,
+		p,
+		m
 	]);
 };
 //#endregion

package/dist/helpers/calculateInheriting.d.ts

@@ -1,4 +1,4 @@
-import { ComponentDefinition, DisplayMode, Element, Schema, Style, StyleItem, StyleState, StyleValue } from '@plitzi/sdk-shared';
+import { ComponentDefinition, DisplayMode, Element, Schema, Style, StyleItem, StylePseudo, StyleState, StyleValue } from '@plitzi/sdk-shared';
 export type InheritData = {
     tree: {
         name: string;
@@ -115,6 +115,8 @@ declare const calculateInheriting: (element: Element | undefined, componentType:
     styleState?: StyleState;
     styleVariant?: string;
     styleAncestor?: string;
+    stylePseudo?: StylePseudo;
+    styleCondition?: string;
     includeSelf?: boolean;
     skipSelectors?: string[];
     addSelectors?: string[];

package/dist/helpers/calculateInheriting.mjs

@@ -38,39 +38,64 @@ var r = (e, t) => {
 		isAncestor: !1,
 		isDefault: !0
 	};
-}, o = (e, t, n, r, i) => {
-	let a = e[t];
-	if (!a) return {};
-	let o = a.default ?? {};
-	if (i) {
-		let e = a.ancestors?.[i], t = r ? e?.variants?.[r] : void 0, s = n ? (t ?? e)?.states?.[n] : void 0;
+}, o = (e, t, n) => {
+	let { styleState: r, styleVariant: i, styleAncestor: a, stylePseudo: o, styleCondition: s } = n, c = e[t];
+	if (!c) return {};
+	let l = c.default ?? {};
+	if (a) {
+		let e = c.ancestors?.[a], t = i ? e?.variants?.[i] : void 0, n = r ? (t ?? e)?.states?.[r] : void 0;
 		return {
-			...o,
+			...l,
 			...e?.default,
 			...t?.default,
-			...s
+			...n
 		};
 	}
-	let s = r ? a.variants?.[r]?.default ?? {} : {}, c = n ? a.states?.[n] ?? {} : {}, l = r && n ? a.variants?.[r]?.states?.[n] ?? {} : {};
+	if (o) {
+		let e = c.pseudos?.[o], t = ((s ? c.conditions?.[s] : void 0) ?? (i ? c.variants?.[i] : void 0))?.pseudos?.[o];
+		return {
+			...e?.default,
+			...r ? e?.states?.[r] : {},
+			...t?.default,
+			...r ? t?.states?.[r] : {}
+		};
+	}
+	let u = r ? c.states?.[r] ?? {} : {};
+	if (s) {
+		let e = c.conditions?.[s];
+		return {
+			...l,
+			...u,
+			...e?.default,
+			...r ? e?.states?.[r] : {}
+		};
+	}
+	let d = i ? c.variants?.[i]?.default ?? {} : {}, f = i && r ? c.variants?.[i]?.states?.[r] ?? {} : {};
 	return {
-		...o,
-		...s,
-		...c,
-		...l
+		...l,
+		...d,
+		...u,
+		...f
 	};
-}, s = (e, t, n, r, i) => o(e.attributes, t, n, r, i), c = (t, o, c, l, u = {}, d = {}) => {
-	let { componentSubType: f, styleSelector: p = "base", styleState: m, styleVariant: h, styleAncestor: g, includeSelf: _ = !1, skipSelectors: v = [], addSelectors: y = [] } = d, b = {
+}, s = (e, t, n) => o(e.attributes, t, n), c = (t, o, c, l, u = {}, d = {}) => {
+	let { componentSubType: f, styleSelector: p = "base", styleState: m, styleVariant: h, styleAncestor: g, stylePseudo: _, styleCondition: v, includeSelf: y = !1, skipSelectors: b = [], addSelectors: x = [] } = d, S = {
+		styleState: m,
+		styleVariant: h,
+		styleAncestor: g,
+		stylePseudo: _,
+		styleCondition: v
+	}, C = {
 		tree: [],
 		style: {},
 		parentStyle: {}
-	}, x = t ? r(c, t) : [], S = /* @__PURE__ */ new Set();
+	}, w = t ? r(c, t) : [], T = /* @__PURE__ */ new Set();
 	for (let e of Object.keys(l)) {
 		let n = l[e];
 		if (n) {
 			if (!t && !o) {
-				for (let t of y) {
+				for (let t of x) {
 					let r = n[t];
-					r && b.tree.push({
+					r && C.tree.push({
 						name: t,
 						displayMode: e,
 						attributes: r.attributes,
@@ -88,8 +113,8 @@ var r = (e, t) => {
 						parentId: void 0
 					},
 					attributes: {}
-				}, o, n, p, y);
-				for (let n of t) v.includes(n.name) || b.tree.push({
+				}, o, n, p, x);
+				for (let n of t) b.includes(n.name) || C.tree.push({
 					name: n.name,
 					displayMode: e,
 					attributes: n.attributes,
@@ -97,16 +122,16 @@ var r = (e, t) => {
 					isAncestor: !1
 				});
 				let r = a(o, f, p, u);
-				r && b.tree.push({
+				r && C.tree.push({
 					...r,
 					displayMode: e
 				});
 				continue;
 			}
-			for (let r of x) {
-				let s = t?.definition.parentId === r.id, c = r.id !== t?.id, l = i(r, r.definition.type === o ? o : void 0, n, p, y);
-				!_ && !c && !m && !h && Object.keys(l).length && (l = l.filter((e) => e.type === "element"));
-				for (let t of l) (!v.includes(t.name) || c) && b.tree.push({
+			for (let r of w) {
+				let s = t?.definition.parentId === r.id, c = r.id !== t?.id, l = i(r, r.definition.type === o ? o : void 0, n, p, x);
+				!y && !c && !m && !h && Object.keys(l).length && (l = l.filter((e) => e.type === "element"));
+				for (let t of l) (!b.includes(t.name) || c) && C.tree.push({
 					name: t.name,
 					displayMode: e,
 					attributes: t.attributes,
@@ -116,7 +141,7 @@ var r = (e, t) => {
 					isDefault: !1
 				});
 				let d = a(r.definition.type, r.attributes.subType, p, u);
-				d && !S.has(r.definition.type) && (S.add(r.definition.type), b.tree.push({
+				d && !T.has(r.definition.type) && (T.add(r.definition.type), C.tree.push({
 					...d,
 					displayMode: e,
 					isParent: s,
@@ -125,23 +150,23 @@ var r = (e, t) => {
 			}
 		}
 	}
-	let C = {};
-	for (let t of b.tree) {
-		let r = s(t, p, m, h, g);
-		if (r && Object.keys(r).length && ((t.isAncestor || t.isDefault && t.componentType !== o) && (r = n(r, e)), Object.keys(r).length)) for (let e of Object.keys(r)) C[e] || (C[e] = []), C[e].push({
+	let E = {};
+	for (let t of C.tree) {
+		let r = s(t, p, S);
+		if (r && Object.keys(r).length && ((t.isAncestor || t.isDefault && t.componentType !== o) && (r = n(r, e)), Object.keys(r).length)) for (let e of Object.keys(r)) E[e] || (E[e] = []), E[e].push({
 			key: t.name,
 			value: r[e],
 			displayMode: t.displayMode
 		});
 	}
-	let w = b.tree.filter((e) => e.isParent).reduce((e, t) => ({
+	let D = C.tree.filter((e) => e.isParent).reduce((e, t) => ({
 		...e,
-		...s(t, p, m, h, g)
+		...s(t, p, S)
 	}), {});
 	return {
-		...b,
-		style: C,
-		parentStyle: w
+		...C,
+		style: E,
+		parentStyle: D
 	};
 };
 //#endregion