@kong/kongponents 9.48.9-pr.3038.fc72bda.0 → 9.48.9-pr.3039.1150ee2.0

package/dist/kongponents.es213.js

@@ -1,9 +1,121 @@
-import e from "./kongponents.es214.js";
-import { getMaximumDepth as _ } from "./kongponents.es214.js";
-/* empty css                  */
-import o from "./kongponents.es74.js";
-const m = /* @__PURE__ */ o(e, [["__scopeId", "data-v-8e1a81f7"]]);
+import { defineComponent as h, computed as s, createBlock as b, openBlock as d, resolveDynamicComponent as x, normalizeStyle as S, withCtx as w, createElementBlock as N } from "vue";
+import { KUI_ICON_SIZE_50 as u } from "./kongponents.es260.js";
+const k = ["aria-hidden"], p = '<path d="M10 18V16H14V18H10ZM6 13V11H18V13H6ZM3 8V6H21V8H3Z" fill="currentColor"/>', q = /* @__PURE__ */ h({
+  __name: "FilterIcon",
+  props: {
+    /** The accessibility text provided to screen readers */
+    title: {
+      type: String,
+      required: !1,
+      default: ""
+    },
+    /** The icon color. Defaults to `currentColor` which inherits text color from the parent element */
+    color: {
+      type: String,
+      required: !1,
+      default: "currentColor"
+    },
+    /** The CSS display property for the icon. Defaults to `block` */
+    display: {
+      type: String,
+      required: !1,
+      default: "block"
+    },
+    /** Whether the icon is just eye-candy or is meaningful to the page (should screen-readers ignore the icon?) */
+    decorative: {
+      type: Boolean,
+      required: !1,
+      default: !1
+    },
+    /** The icon size */
+    size: {
+      type: [Number, String],
+      required: !1,
+      default: u,
+      // if setting to the imported const fails, just pass a number of 24 as the default.
+      validator: (r) => {
+        if (typeof r == "number" && r > 0)
+          return !0;
+        if (typeof r == "string") {
+          const e = String(r).replace(/px/gi, ""), i = Number(e);
+          if (i && !isNaN(i) && Number.isInteger(i) && i > 0)
+            return !0;
+        }
+        return !1;
+      }
+    },
+    /** The HTML tag to utilize for the icon's wrapper element. Defaults to `span` */
+    as: {
+      type: String,
+      required: !1,
+      default: "span"
+    },
+    /**
+     * A boolean to disable prefixing any internal SVG ids with a unique string which is done to resolve the potential for multiple SVG instances on the same page and the SVG utilizing the same ids and references internally (e.g. in the `<defs>` tag).
+     * Typically only set to `true` during snapshot testing.
+     * Defaults to `false`.
+     */
+    staticIds: {
+      type: Boolean,
+      default: !1
+    }
+  },
+  setup(r) {
+    const e = r, i = s(() => {
+      if (typeof e.size == "number" && e.size > 0)
+        return `${e.size}px`;
+      if (typeof e.size == "string") {
+        const a = String(e.size).replace(/px/gi, ""), t = Number(a);
+        if (t && !isNaN(t) && Number.isInteger(t) && t > 0)
+          return `${t}px`;
+      }
+      return u;
+    }), c = s(() => ({
+      boxSizing: "border-box",
+      color: e.color,
+      display: e.display,
+      flexShrink: "0",
+      height: i.value,
+      lineHeight: "0",
+      width: i.value,
+      pointerEvents: e.decorative ? "none" : void 0
+    })), f = (a) => {
+      const t = {}, y = Math.random().toString(36).substring(2, 12);
+      return a.replace(/id="([^"]+)"/g, (o, n) => {
+        const l = `${y}-${n}`;
+        return t[n] = l, `id="${l}"`;
+      }).replace(/#([^\s^")]+)/g, (o, n) => t[n] ? `#${t[n]}` : o);
+    }, g = {
+      "<": "&lt;",
+      ">": "&gt;",
+      '"': "&quot;",
+      "'": "&#39;",
+      "&": "&amp;"
+    }, m = (a) => a.replace(/[<>"'&]/g, (t) => g[t]), v = `${e.title ? `<title data-testid="kui-icon-svg-title">${m(e.title)}</title>` : ""}${e.staticIds ? p : f(p)}`;
+    return (a, t) => (d(), b(x(r.as), {
+      "aria-hidden": r.decorative ? "true" : void 0,
+      class: "kui-icon filter-icon",
+      "data-testid": "kui-icon-wrapper-filter-icon",
+      style: S(c.value),
+      tabindex: r.decorative ? "-1" : void 0
+    }, {
+      default: w(() => [
+        (d(), N("svg", {
+          "aria-hidden": r.decorative ? "true" : void 0,
+          "data-testid": "kui-icon-svg-filter-icon",
+          fill: "none",
+          height: "100%",
+          role: "img",
+          viewBox: "0 0 24 24",
+          width: "100%",
+          xmlns: "http://www.w3.org/2000/svg",
+          innerHTML: v
+        }, null, 8, k))
+      ]),
+      _: 1
+    }, 8, ["aria-hidden", "style", "tabindex"]));
+  }
+});
 export {
-  m as default,
-  _ as getMaximumDepth
+  q as default
 };

package/dist/kongponents.es214.js

@@ -1,191 +1,121 @@
-import { defineComponent as H, ref as g, computed as S, useTemplateRef as Q, watch as U, onMounted as W, nextTick as I, resolveComponent as X, createBlock as b, openBlock as s, unref as Y, mergeProps as Z, withCtx as c, createElementBlock as $, Fragment as _, renderList as ee, normalizeClass as L, withDirectives as le, createSlots as B, renderSlot as h, createTextVNode as ae, toDisplayString as te, vShow as ne } from "vue";
-import { VueDraggableNext as ie } from "./kongponents.es334.js";
-import oe from "./kongponents.es335.js";
-const T = ({ children: a = [] }) => a.length === 0 ? 0 : 1 + Math.max(...a.map(T)), ce = /* @__PURE__ */ H({
-  __name: "KTreeDraggable",
+import { defineComponent as y, computed as s, createBlock as x, openBlock as d, resolveDynamicComponent as L, normalizeStyle as h, withCtx as b, createElementBlock as S } from "vue";
+import { KUI_ICON_SIZE_50 as u } from "./kongponents.es260.js";
+const N = ["aria-hidden"], p = '<path d="M4.30937 19.025C3.49271 18.075 2.86198 16.9917 2.41719 15.775C1.9724 14.5583 1.75 13.2833 1.75 11.95C1.75 10.6167 1.96875 9.34167 2.40625 8.125C2.84375 6.90833 3.47812 5.825 4.30937 4.875L5.55625 6.3C4.88542 7.05 4.375 7.9125 4.025 8.8875C3.675 9.8625 3.5 10.8833 3.5 11.95C3.5 13.0167 3.67865 14.0375 4.03594 15.0125C4.39323 15.9875 4.9 16.85 5.55625 17.6L4.30937 19.025ZM8.3125 18C7.94792 18 7.63802 17.8542 7.38281 17.5625C7.1276 17.2708 7 16.9167 7 16.5C7 16.0833 7.1276 15.7292 7.38281 15.4375C7.63802 15.1458 7.94792 15 8.3125 15C8.67708 15 8.98698 15.1458 9.24219 15.4375C9.49739 15.7292 9.625 16.0833 9.625 16.5C9.625 16.9167 9.49739 17.2708 9.24219 17.5625C8.98698 17.8542 8.67708 18 8.3125 18ZM11.3531 13V11.225L10.0187 12.125L9.14375 10.375L10.4781 9.5L9.14375 8.625L10.0187 6.875L11.3531 7.775V6H13.1031V7.775L14.4375 6.875L15.3125 8.625L13.9781 9.5L15.3125 10.375L14.4375 12.125L13.1031 11.225V13H11.3531ZM16.6906 19.025L15.4437 17.6C16.1146 16.85 16.625 15.9875 16.975 15.0125C17.325 14.0375 17.5 13.0167 17.5 11.95C17.5 10.8833 17.3214 9.8625 16.9641 8.8875C16.6068 7.9125 16.1 7.05 15.4437 6.3L16.6906 4.875C17.5073 5.825 18.138 6.90833 18.5828 8.125C19.0276 9.34167 19.25 10.6167 19.25 11.95C19.25 13.2833 19.0312 14.5583 18.5937 15.775C18.1562 16.9917 17.5219 18.075 16.6906 19.025Z" fill="currentColor"/>', z = /* @__PURE__ */ y({
+  __name: "RegexIcon",
   props: {
-    items: {},
-    disableDrag: { type: Boolean },
-    filter: { type: [String, Function] },
-    maxDepth: {},
-    level: { default: 0 },
-    parentId: {},
-    hideIcons: { type: Boolean },
-    group: {},
-    collapsible: { type: Boolean },
-    initialCollapseAll: { type: Boolean }
+    /** The accessibility text provided to screen readers */
+    title: {
+      type: String,
+      required: !1,
+      default: ""
+    },
+    /** The icon color. Defaults to `currentColor` which inherits text color from the parent element */
+    color: {
+      type: String,
+      required: !1,
+      default: "currentColor"
+    },
+    /** The CSS display property for the icon. Defaults to `block` */
+    display: {
+      type: String,
+      required: !1,
+      default: "block"
+    },
+    /** Whether the icon is just eye-candy or is meaningful to the page (should screen-readers ignore the icon?) */
+    decorative: {
+      type: Boolean,
+      required: !1,
+      default: !1
+    },
+    /** The icon size */
+    size: {
+      type: [Number, String],
+      required: !1,
+      default: u,
+      // if setting to the imported const fails, just pass a number of 24 as the default.
+      validator: (r) => {
+        if (typeof r == "number" && r > 0)
+          return !0;
+        if (typeof r == "string") {
+          const e = String(r).replace(/px/gi, ""), i = Number(e);
+          if (i && !isNaN(i) && Number.isInteger(i) && i > 0)
+            return !0;
+        }
+        return !1;
+      }
+    },
+    /** The HTML tag to utilize for the icon's wrapper element. Defaults to `span` */
+    as: {
+      type: String,
+      required: !1,
+      default: "span"
+    },
+    /**
+     * A boolean to disable prefixing any internal SVG ids with a unique string which is done to resolve the potential for multiple SVG instances on the same page and the SVG utilizing the same ids and references internally (e.g. in the `<defs>` tag).
+     * Typically only set to `true` during snapshot testing.
+     * Defaults to `false`.
+     */
+    staticIds: {
+      type: Boolean,
+      default: !1
+    }
   },
-  emits: ["change", "child-change", "selected"],
-  setup(a, { expose: A, emit: w }) {
-    const d = w, v = g(0), n = g([]), M = {
-      tag: "div",
-      // Note: force-fallback: true is required to override cursor when dragging
-      "force-fallback": !0,
-      animation: "100",
-      draggable: ".tree-item-container",
-      "item-key": "id",
-      "ghost-class": "tree-item-dragged",
-      "drag-class": "tree-item-grabbing",
-      class: "child-drop-zone",
-      "fallback-tolerance": 10
-    }, m = g(!1), p = S(() => [".tree-item-expanded-button", ...(typeof a.filter == "function" ? a.filter() : a.filter).split(",").map((l) => l.trim()).filter(Boolean)].join(", ")), y = (e) => {
-      var l, i;
-      return !((i = (l = n.value.filter((t) => t.id === e.id)) == null ? void 0 : l[0].children) != null && i.length);
-    }, N = (e) => e.children || [], V = (e) => {
-      a.parentId ? d("child-change", {
-        parentId: a.parentId,
-        children: n.value,
-        target: (e == null ? void 0 : e.added) || (e == null ? void 0 : e.removed) || (e == null ? void 0 : e.moved)
-      }) : d("change", {
-        items: n.value,
-        target: (e == null ? void 0 : e.added) || (e == null ? void 0 : e.removed) || (e == null ? void 0 : e.moved)
-      });
-    }, K = (e) => {
-      d("child-change", e);
-    }, E = (e) => {
-      d("selected", e);
-    }, r = g(/* @__PURE__ */ new Map()), F = (e, l) => {
-      r.value.set(l, e);
-    }, O = (e) => a.collapsible ? !!r.value.get(e) : !0, f = Q("tree-items"), z = () => {
-      var e;
-      n.value.forEach((l) => {
-        r.value.set(l.id, !1);
-      }), (e = f.value) == null || e.forEach((l) => {
-        l == null || l.setExpandedValue(!1);
-      });
-    }, J = () => {
-      var e;
-      n.value.forEach((l) => {
-        r.value.set(l.id, !0);
-      }), (e = f.value) == null || e.forEach((l) => {
-        l == null || l.setExpandedValue(!0);
-      });
-    }, R = S(() => a.level > a.maxDepth - 1), j = (e) => {
-      var u, D, x, k;
-      const l = ((D = (u = e.relatedContext) == null ? void 0 : u.component) == null ? void 0 : D.$attrs.level) || 0, i = (x = e.draggedContext) == null ? void 0 : x.element;
-      let t = 0;
-      return (k = i.children) != null && k.length && (t = T(i)), !(l + t > a.maxDepth - 1);
-    }, P = (e) => {
-      var t, o;
-      const l = ((o = (t = e.item) == null ? void 0 : t._underlying_vm_) == null ? void 0 : o.id) || "", i = n.value.find((u) => u.id === l);
-      m.value = !0, i && d("selected", i), C(!0);
-    }, q = async () => {
-      var e;
-      m.value = !1, C(!1), v.value++, await I(), (e = f.value) == null || e.forEach((l) => {
-        l == null || l.setExpandedValue(r.value.get(l == null ? void 0 : l.id));
-      });
-    }, C = (e) => {
-      const l = document == null ? void 0 : document.getElementsByTagName("html").item(0);
-      l && l.classList.toggle("tree-list-grabbing", e);
-    };
-    U(() => a.items, (e, l) => {
-      JSON.stringify(e) !== JSON.stringify(l) && (n.value = e, n.value.forEach((i) => {
-        i.children || (i.children = []);
-      }));
-    });
-    const G = () => {
-      n.value.forEach((e) => {
-        r.value.set(e.id, !a.initialCollapseAll);
-      });
-    };
-    return W(async () => {
-      n.value = a.items, n.value.forEach((e) => {
-        e.children || (e.children = []);
-      }), await I(), a.collapsible && G();
-    }), A({ collapseAll: z, expandAll: J }), (e, l) => {
-      const i = X("KTreeDraggable", !0);
-      return s(), b(Y(ie), Z(M, {
-        class: "tree-draggable",
-        direction: "vertical",
-        disabled: a.disableDrag,
-        filter: p.value,
-        group: { name: a.group, pull: [a.group], put: R.value ? [] : [a.group] },
-        level: a.level,
-        list: n.value,
-        move: j,
-        tag: "div",
-        onChange: V,
-        onEnd: q,
-        onStart: P
-      }), {
-        default: c(() => [
-          (s(!0), $(_, null, ee(n.value, (t) => (s(), $("div", {
-            key: t.id,
-            class: L(["tree-item-container", {
-              "has-no-children": y(t)
-            }])
-          }, [
-            (s(), b(oe, {
-              key: `tree-item-${t.id}-${v.value}`,
-              ref_for: !0,
-              ref: "tree-items",
-              collapsible: a.collapsible,
-              "controls-id": t.id,
-              disabled: a.disableDrag,
-              "has-children": !y(t),
-              "hide-icons": a.hideIcons,
-              "initial-collapse": a.initialCollapseAll,
-              item: t,
-              onExpanded: (o) => F(o, t.id),
-              onSelected: E
-            }, B({
-              "item-label": c(() => [
-                h(e.$slots, "item-label", { item: t }, () => [
-                  ae(te(t.name), 1)
-                ], !0)
-              ]),
-              _: 2
-            }, [
-              e.$slots["item-icon"] ? {
-                name: "item-icon",
-                fn: c(() => [
-                  h(e.$slots, "item-icon", { item: t }, void 0, !0)
-                ]),
-                key: "0"
-              } : void 0
-            ]), 1032, ["collapsible", "controls-id", "disabled", "has-children", "hide-icons", "initial-collapse", "item", "onExpanded"])),
-            le((s(), b(i, {
-              id: `tree-list-draggable-${t.id}`,
-              key: `tree-item-${t.id}-children-${v.value}`,
-              class: L({
-                collapsible: a.collapsible
-              }),
-              collapsible: a.collapsible,
-              "disable-drag": a.disableDrag,
-              filter: p.value,
-              group: a.group,
-              "hide-icons": a.hideIcons,
-              "initial-collapse-all": a.initialCollapseAll,
-              items: N(t),
-              level: a.level + 1,
-              "max-depth": a.maxDepth,
-              "parent-id": t.id,
-              onChildChange: K,
-              onSelected: E
-            }, B({
-              "item-label": c(({ item: o }) => [
-                h(e.$slots, "item-label", { item: o }, void 0, !0)
-              ]),
-              _: 2
-            }, [
-              e.$slots["item-icon"] ? {
-                name: "item-icon",
-                fn: c(({ item: o }) => [
-                  h(e.$slots, "item-icon", { item: o }, void 0, !0)
-                ]),
-                key: "0"
-              } : void 0
-            ]), 1032, ["id", "class", "collapsible", "disable-drag", "filter", "group", "hide-icons", "initial-collapse-all", "items", "level", "max-depth", "parent-id"])), [
-              [ne, O(t.id)]
-            ])
-          ], 2))), 128))
-        ]),
-        _: 3
-      }, 16, ["disabled", "filter", "group", "level", "list"]);
-    };
+  setup(r) {
+    const e = r, i = s(() => {
+      if (typeof e.size == "number" && e.size > 0)
+        return `${e.size}px`;
+      if (typeof e.size == "string") {
+        const a = String(e.size).replace(/px/gi, ""), t = Number(a);
+        if (t && !isNaN(t) && Number.isInteger(t) && t > 0)
+          return `${t}px`;
+      }
+      return u;
+    }), c = s(() => ({
+      boxSizing: "border-box",
+      color: e.color,
+      display: e.display,
+      flexShrink: "0",
+      height: i.value,
+      lineHeight: "0",
+      width: i.value,
+      pointerEvents: e.decorative ? "none" : void 0
+    })), f = (a) => {
+      const t = {}, v = Math.random().toString(36).substring(2, 12);
+      return a.replace(/id="([^"]+)"/g, (o, n) => {
+        const l = `${v}-${n}`;
+        return t[n] = l, `id="${l}"`;
+      }).replace(/#([^\s^")]+)/g, (o, n) => t[n] ? `#${t[n]}` : o);
+    }, g = {
+      "<": "&lt;",
+      ">": "&gt;",
+      '"': "&quot;",
+      "'": "&#39;",
+      "&": "&amp;"
+    }, C = (a) => a.replace(/[<>"'&]/g, (t) => g[t]), m = `${e.title ? `<title data-testid="kui-icon-svg-title">${C(e.title)}</title>` : ""}${e.staticIds ? p : f(p)}`;
+    return (a, t) => (d(), x(L(r.as), {
+      "aria-hidden": r.decorative ? "true" : void 0,
+      class: "kui-icon regex-icon",
+      "data-testid": "kui-icon-wrapper-regex-icon",
+      style: h(c.value),
+      tabindex: r.decorative ? "-1" : void 0
+    }, {
+      default: b(() => [
+        (d(), S("svg", {
+          "aria-hidden": r.decorative ? "true" : void 0,
+          "data-testid": "kui-icon-svg-regex-icon",
+          fill: "none",
+          height: "100%",
+          role: "img",
+          viewBox: "0 0 24 24",
+          width: "100%",
+          xmlns: "http://www.w3.org/2000/svg",
+          innerHTML: m
+        }, null, 8, N))
+      ]),
+      _: 1
+    }, 8, ["aria-hidden", "style", "tabindex"]));
   }
 });
 export {
-  ce as default,
-  T as getMaximumDepth
+  z as default
 };

package/dist/kongponents.es215.js

@@ -1,7 +1,7 @@
-import { defineComponent as y, computed as s, createBlock as h, openBlock as d, resolveDynamicComponent as b, normalizeStyle as x, withCtx as L, createElementBlock as S } from "vue";
-import { KUI_ICON_SIZE_50 as u } from "./kongponents.es253.js";
-const N = ["aria-hidden"], c = '<path d="M8.4 17L12 13.4L15.6 17L17 15.6L13.4 12L17 8.4L15.6 7L12 10.6L8.4 7L7 8.4L10.6 12L7 15.6L8.4 17ZM12 22C10.6167 22 9.31667 21.7375 8.1 21.2125C6.88333 20.6875 5.825 19.975 4.925 19.075C4.025 18.175 3.3125 17.1167 2.7875 15.9C2.2625 14.6833 2 13.3833 2 12C2 10.6167 2.2625 9.31667 2.7875 8.1C3.3125 6.88333 4.025 5.825 4.925 4.925C5.825 4.025 6.88333 3.3125 8.1 2.7875C9.31667 2.2625 10.6167 2 12 2C13.3833 2 14.6833 2.2625 15.9 2.7875C17.1167 3.3125 18.175 4.025 19.075 4.925C19.975 5.825 20.6875 6.88333 21.2125 8.1C21.7375 9.31667 22 10.6167 22 12C22 13.3833 21.7375 14.6833 21.2125 15.9C20.6875 17.1167 19.975 18.175 19.075 19.075C18.175 19.975 17.1167 20.6875 15.9 21.2125C14.6833 21.7375 13.3833 22 12 22Z" fill="currentColor"/>', z = /* @__PURE__ */ y({
-  __name: "ClearIcon",
+import { defineComponent as h, computed as s, createBlock as y, openBlock as d, resolveDynamicComponent as b, normalizeStyle as x, withCtx as S, createElementBlock as N } from "vue";
+import { KUI_ICON_SIZE_50 as u } from "./kongponents.es260.js";
+const k = ["aria-hidden"], c = '<path d="M19.6 21L13.3 14.7C12.8 15.1 12.225 15.4167 11.575 15.65C10.925 15.8833 10.2333 16 9.5 16C7.68333 16 6.14583 15.3708 4.8875 14.1125C3.62917 12.8542 3 11.3167 3 9.5C3 7.68333 3.62917 6.14583 4.8875 4.8875C6.14583 3.62917 7.68333 3 9.5 3C11.3167 3 12.8542 3.62917 14.1125 4.8875C15.3708 6.14583 16 7.68333 16 9.5C16 10.2333 15.8833 10.925 15.65 11.575C15.4167 12.225 15.1 12.8 14.7 13.3L21 19.6L19.6 21ZM9.5 14C10.75 14 11.8125 13.5625 12.6875 12.6875C13.5625 11.8125 14 10.75 14 9.5C14 8.25 13.5625 7.1875 12.6875 6.3125C11.8125 5.4375 10.75 5 9.5 5C8.25 5 7.1875 5.4375 6.3125 6.3125C5.4375 7.1875 5 8.25 5 9.5C5 10.75 5.4375 11.8125 6.3125 12.6875C7.1875 13.5625 8.25 14 9.5 14Z" fill="currentColor"/>', $ = /* @__PURE__ */ h({
+  __name: "SearchIcon",
   props: {
     /** The accessibility text provided to screen readers */
     title: {
@@ -92,17 +92,17 @@ const N = ["aria-hidden"], c = '<path d="M8.4 17L12 13.4L15.6 17L17 15.6L13.4 12
       "'": "&#39;",
       "&": "&amp;"
     }, C = (a) => a.replace(/[<>"'&]/g, (t) => g[t]), m = `${e.title ? `<title data-testid="kui-icon-svg-title">${C(e.title)}</title>` : ""}${e.staticIds ? c : f(c)}`;
-    return (a, t) => (d(), h(b(r.as), {
+    return (a, t) => (d(), y(b(r.as), {
       "aria-hidden": r.decorative ? "true" : void 0,
-      class: "kui-icon clear-icon",
-      "data-testid": "kui-icon-wrapper-clear-icon",
+      class: "kui-icon search-icon",
+      "data-testid": "kui-icon-wrapper-search-icon",
       style: x(p.value),
       tabindex: r.decorative ? "-1" : void 0
     }, {
-      default: L(() => [
-        (d(), S("svg", {
+      default: S(() => [
+        (d(), N("svg", {
           "aria-hidden": r.decorative ? "true" : void 0,
-          "data-testid": "kui-icon-svg-clear-icon",
+          "data-testid": "kui-icon-svg-search-icon",
           fill: "none",
           height: "100%",
           role: "img",
@@ -110,12 +110,12 @@ const N = ["aria-hidden"], c = '<path d="M8.4 17L12 13.4L15.6 17L17 15.6L13.4 12
           width: "100%",
           xmlns: "http://www.w3.org/2000/svg",
           innerHTML: m
-        }, null, 8, N))
+        }, null, 8, k))
       ]),
       _: 1
     }, 8, ["aria-hidden", "style", "tabindex"]));
   }
 });
 export {
-  z as default
+  $ as default
 };