aloha-vue 2.74.0 → 2.75.0

package/src/ui/AInputNumber/AInputNumber.js

@@ -31,13 +31,18 @@ import PlaceholderAPI from "../../ATranslation/compositionAPI/PlaceholderAPI";
 import VerifyAPI from "./compositionAPI/VerifyAPI";
 import WidthAPI from "./compositionAPI/WidthAPI";
 
-import Dash from "aloha-svg/dist/js/bootstrap/Dash";
-import Plus from "aloha-svg/dist/js/bootstrap/Plus";
 import UiMixinProps from "../mixins/UiMixinProps";
 import {
   isNumber,
 } from "lodash-es";
 
+const Dash = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-dash" viewBox="0 0 16 16">
+  <path d="M4 8a.5.5 0 0 1 .5-.5h7a.5.5 0 0 1 0 1h-7A.5.5 0 0 1 4 8"/>
+</svg>`;
+const Plus = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus" viewBox="0 0 16 16">
+  <path d="M8 4a.5.5 0 0 1 .5.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3A.5.5 0 0 1 8 4"/>
+</svg>`;
+
 export default {
   name: "AInputNumber",
   inheritAttrs: false,
@@ -360,11 +365,11 @@ export default {
             a_form_element__parent_invalid: this.isErrors,
           }],
         }, [
-          this.label && !this.isLabelFloat && h(ALabel, {
-            id: this.htmlIdLocal,
-            alwaysTranslate: this.alwaysTranslate,
-            extra: this.extra,
-            label: this.label,
+          this.label && !this.isLabelFloat && h(ALabel, {
+            id: this.htmlIdLocal,
+            alwaysTranslate: this.alwaysTranslate,
+            extra: this.extra,
+            label: this.label,
             labelClass: this.labelClass,
             labelScreenReader: this.labelScreenReader,
             required: this.required,
@@ -393,11 +398,11 @@ export default {
                 ...this.inputWidthStyleValue,
               },
             }, [
-              this.label && this.isLabelFloat && h(ALabel, {
-                id: this.htmlIdLocal,
-                alwaysTranslate: this.alwaysTranslate,
-                extra: this.extra,
-                label: this.label,
+              this.label && this.isLabelFloat && h(ALabel, {
+                id: this.htmlIdLocal,
+                alwaysTranslate: this.alwaysTranslate,
+                extra: this.extra,
+                label: this.label,
                 labelClass: this.labelClass,
                 labelScreenReader: this.labelScreenReader,
                 required: this.required,

package/src/ui/AJson/AJson.js

@@ -21,13 +21,22 @@ import HeightAPI from "./compositionAPI/HeightAPI";
 import JsonAPI from "./compositionAPI/JsonAPI";
 import ReadonlyAPI from "./compositionAPI/ReadonlyAPI";
 
-import ArrowRepeat from "aloha-svg/dist/js/bootstrap/ArrowRepeat";
-import Braces from "aloha-svg/dist/js/bootstrap/Braces";
-import Trash from "aloha-svg/dist/js/bootstrap/Trash";
 import {
   uniqueId,
 } from "lodash-es";
 
+const ArrowRepeat = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-repeat" viewBox="0 0 16 16">
+  <path d="M11.534 7h3.932a.25.25 0 0 1 .192.41l-1.966 2.36a.25.25 0 0 1-.384 0l-1.966-2.36a.25.25 0 0 1 .192-.41m-11 2h3.932a.25.25 0 0 0 .192-.41L2.692 6.23a.25.25 0 0 0-.384 0L.342 8.59A.25.25 0 0 0 .534 9"/>
+  <path fill-rule="evenodd" d="M8 3c-1.552 0-2.94.707-3.857 1.818a.5.5 0 1 1-.771-.636A6.002 6.002 0 0 1 13.917 7H12.9A5 5 0 0 0 8 3M3.1 9a5.002 5.002 0 0 0 8.757 2.182.5.5 0 1 1 .771.636A6.002 6.002 0 0 1 2.083 9z"/>
+</svg>`;
+const Braces = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-braces" viewBox="0 0 16 16">
+  <path d="M2.114 8.063V7.9c1.005-.102 1.497-.615 1.497-1.6V4.503c0-1.094.39-1.538 1.354-1.538h.273V2h-.376C3.25 2 2.49 2.759 2.49 4.352v1.524c0 1.094-.376 1.456-1.49 1.456v1.299c1.114 0 1.49.362 1.49 1.456v1.524c0 1.593.759 2.352 2.372 2.352h.376v-.964h-.273c-.964 0-1.354-.444-1.354-1.538V9.663c0-.984-.492-1.497-1.497-1.6M13.886 7.9v.163c-1.005.103-1.497.616-1.497 1.6v1.798c0 1.094-.39 1.538-1.354 1.538h-.273v.964h.376c1.613 0 2.372-.759 2.372-2.352v-1.524c0-1.094.376-1.456 1.49-1.456V7.332c-1.114 0-1.49-.362-1.49-1.456V4.352C13.51 2.759 12.75 2 11.138 2h-.376v.964h.273c.964 0 1.354.444 1.354 1.538V6.3c0 .984.492 1.497 1.497 1.6"/>
+</svg>`;
+const Trash = `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-trash" viewBox="0 0 16 16">
+  <path d="M5.5 5.5A.5.5 0 0 1 6 6v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5m2.5 0a.5.5 0 0 1 .5.5v6a.5.5 0 0 1-1 0V6a.5.5 0 0 1 .5-.5m3 .5a.5.5 0 0 0-1 0v6a.5.5 0 0 0 1 0z"/>
+  <path d="M14.5 3a1 1 0 0 1-1 1H13v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V4h-.5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1H6a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1h3.5a1 1 0 0 1 1 1zM4.118 4 4 4.059V13a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V4.059L11.882 4zM2.5 3h11V2h-11z"/>
+</svg>`;
+
 export default {
   name: "AJson",
   inheritAttrs: false,

package/src/ui/AJson/compositionAPI/JsonAPI.js

@@ -1,116 +1,116 @@
-import {
-  ref,
-  toRef,
-} from "vue";
-
-import {
-  cloneDeep,
-} from "lodash-es";
-
-export default function JsonAPI(props, {
-  changeModel = () => {},
-}) {
-  const disabled = toRef(props, "disabled");
-  const modelUndefined = toRef(props, "modelUndefined");
-  const modelValue = toRef(props, "modelValue");
-
-  const initialValue = ref(undefined);
-  const jsonString = ref("");
-  const jsonStringInput = ref("");
-  const parseError = ref(undefined);
-
-  const initInitialValue = () => {
-    initialValue.value = cloneDeep(modelValue.value) || "";
-  };
-
-  const clearModel = () => {
-    if (disabled.value) {
-      return;
-    }
-    changeModel({
-      model: modelUndefined.value,
-    });
-  };
-
-  const JSONtoString = () => {
-    try {
-      if (modelValue.value) {
-        jsonString.value = JSON.stringify(modelValue.value, undefined, 2);
-      } else {
-        jsonString.value = "";
-      }
-      jsonStringInput.value = jsonString.value;
-      parseError.value = undefined;
-    } catch (e) {
-    }
-  };
-
-  const stringToJSON = $event => {
-    if (disabled.value) {
-      return;
-    }
-
-    if (!jsonStringInput.value || jsonStringInput.value.length === 0) {
-      changeModel({
-        $event,
-        model: modelUndefined.value,
-      });
-    } else {
-      try {
-        const MODEL = JSON.parse(jsonStringInput.value);
-        changeModel({
-          $event,
-          model: MODEL,
-        });
-        jsonString.value = JSON.stringify(MODEL, undefined, 2);
-        parseError.value = null;
-      } catch (e) {
-        parseError.value = e.toString();
-      }
-    }
-  };
-
-  const onInput = $event => {
-    if (disabled.value) {
-      return;
-    }
-
-    jsonStringInput.value = $event.target.value;
-    stringToJSON();
-  };
-
-  const formatJson = () => {
-    try {
-      jsonStringInput.value = JSON.stringify(JSON.parse(jsonStringInput.value), undefined, 2);
-    } catch (e) {
-      parseError.value = e.toString();
-    }
-  };
-
-  const resetModel = () => {
-    if (disabled.value) {
-      return;
-    }
-
-    changeModel({
-      model: initialValue.value,
-    });
-    setTimeout(() => {
-      JSONtoString();
-    });
-  };
-
-  return {
-    clearModel,
-    formatJson,
-    initialValue,
-    initInitialValue,
-    jsonString,
-    jsonStringInput,
-    JSONtoString,
-    onInput,
-    parseError,
-    resetModel,
-    stringToJSON,
-  };
-}
+import {
+  ref,
+  toRef,
+} from "vue";
+
+import {
+  cloneDeep,
+} from "lodash-es";
+
+export default function JsonAPI(props, {
+  changeModel = () => {},
+}) {
+  const disabled = toRef(props, "disabled");
+  const modelUndefined = toRef(props, "modelUndefined");
+  const modelValue = toRef(props, "modelValue");
+
+  const initialValue = ref(undefined);
+  const jsonString = ref("");
+  const jsonStringInput = ref("");
+  const parseError = ref(undefined);
+
+  const initInitialValue = () => {
+    initialValue.value = cloneDeep(modelValue.value) || "";
+  };
+
+  const clearModel = () => {
+    if (disabled.value) {
+      return;
+    }
+    changeModel({
+      model: modelUndefined.value,
+    });
+  };
+
+  const JSONtoString = () => {
+    try {
+      if (modelValue.value) {
+        jsonString.value = JSON.stringify(modelValue.value, undefined, 2);
+      } else {
+        jsonString.value = "";
+      }
+      jsonStringInput.value = jsonString.value;
+      parseError.value = undefined;
+    } catch(e) {
+    }
+  };
+
+  const stringToJSON = $event => {
+    if (disabled.value) {
+      return;
+    }
+
+    if (!jsonStringInput.value || jsonStringInput.value.length === 0) {
+      changeModel({
+        $event,
+        model: modelUndefined.value,
+      });
+    } else {
+      try {
+        const MODEL = JSON.parse(jsonStringInput.value);
+        changeModel({
+          $event,
+          model: MODEL,
+        });
+        jsonString.value = JSON.stringify(MODEL, undefined, 2);
+        parseError.value = null;
+      } catch(e) {
+        parseError.value = e.toString();
+      }
+    }
+  };
+
+  const onInput = $event => {
+    if (disabled.value) {
+      return;
+    }
+
+    jsonStringInput.value = $event.target.value;
+    stringToJSON();
+  };
+
+  const formatJson = () => {
+    try {
+      jsonStringInput.value = JSON.stringify(JSON.parse(jsonStringInput.value), undefined, 2);
+    } catch(e) {
+      parseError.value = e.toString();
+    }
+  };
+
+  const resetModel = () => {
+    if (disabled.value) {
+      return;
+    }
+
+    changeModel({
+      model: initialValue.value,
+    });
+    setTimeout(() => {
+      JSONtoString();
+    });
+  };
+
+  return {
+    clearModel,
+    formatJson,
+    initialValue,
+    initInitialValue,
+    jsonString,
+    jsonStringInput,
+    JSONtoString,
+    onInput,
+    parseError,
+    resetModel,
+    stringToJSON,
+  };
+}

package/src/ui/ALabel/__tests__/ALabel.IdAPI.test.js

@@ -1,42 +1,42 @@
-import {
-  computed,
-} from "vue";
-import {
-  describe,
-  expect,
-  it,
-} from "@jest/globals";
-
-import IdAPI from "../compositionAPI/IdAPI";
-
-describe("ALabel IdAPI", () => {
-  it("'forLabelLocal' and 'idLabelLocal' should return correct values when 'hideForLocal' and 'hideIdLocal' are false", () => {
-    const props = { id: "user", idSuffix: "_123" };
-
-    const {
-      forLabelLocal,
-      idLabelLocal,
-    } = IdAPI(props, {
-      hideForLocal: computed(() => false),
-      hideIdLocal: computed(() => false),
-    });
-
-    expect(idLabelLocal.value).toBe("user_123");
-    expect(forLabelLocal.value).toBe("user");
-  });
-
-  it("'forLabelLocal' and 'idLabelLocal' should be undefined when 'hideForLocal' and 'hideIdLocal' are true", () => {
-    const props = { id: "user", idSuffix: "_123" };
-
-    const {
-      forLabelLocal,
-      idLabelLocal,
-    } = IdAPI(props, {
-      hideForLocal: computed(() => true),
-      hideIdLocal: computed(() => true),
-    });
-
-    expect(idLabelLocal.value).toBeUndefined();
-    expect(forLabelLocal.value).toBeUndefined();
-  });
-});
+import {
+  computed,
+} from "vue";
+import {
+  describe,
+  expect,
+  it,
+} from "vitest";
+
+import IdAPI from "../compositionAPI/IdAPI";
+
+describe("ALabel IdAPI", () => {
+  it("'forLabelLocal' and 'idLabelLocal' should return correct values when 'hideForLocal' and 'hideIdLocal' are false", () => {
+    const props = { id: "user", idSuffix: "_123" };
+
+    const {
+      forLabelLocal,
+      idLabelLocal,
+    } = IdAPI(props, {
+      hideForLocal: computed(() => false),
+      hideIdLocal: computed(() => false),
+    });
+
+    expect(idLabelLocal.value).toBe("user_123");
+    expect(forLabelLocal.value).toBe("user");
+  });
+
+  it("'forLabelLocal' and 'idLabelLocal' should be undefined when 'hideForLocal' and 'hideIdLocal' are true", () => {
+    const props = { id: "user", idSuffix: "_123" };
+
+    const {
+      forLabelLocal,
+      idLabelLocal,
+    } = IdAPI(props, {
+      hideForLocal: computed(() => true),
+      hideIdLocal: computed(() => true),
+    });
+
+    expect(idLabelLocal.value).toBeUndefined();
+    expect(forLabelLocal.value).toBeUndefined();
+  });
+});

package/src/ui/ALabel/__tests__/ALabel.LabelAPI.test.js

@@ -1,33 +1,33 @@
-import {
-  describe,
-  expect,
-  it,
-} from "@jest/globals";
-
-import LabelAPI from "../compositionAPI/LabelAPI";
-
-describe("ALabel LabelAPI", () => {
-  it("textAfterLabel should be empty when 'required' is false", () => {
-    const {
-      textAfterLabel,
-    } = LabelAPI({ required: false, label: "Aloha" });
-
-    expect(textAfterLabel.value).toBe("");
-  });
-
-  it("textAfterLabel should be empty when 'label' is empty", () => {
-    const {
-      textAfterLabel,
-    } = LabelAPI({ required: false, label: "" });
-
-    expect(textAfterLabel.value).toBe("");
-  });
-
-  it("textAfterLabel should be asterisk when 'required' is true", () => {
-    const {
-      textAfterLabel,
-    } = LabelAPI({ required: true, label: "Aloha" });
-
-    expect(textAfterLabel.value).toBe("*");
-  });
-});
+import {
+  describe,
+  expect,
+  it,
+} from "vitest";
+
+import LabelAPI from "../compositionAPI/LabelAPI";
+
+describe("ALabel LabelAPI", () => {
+  it("textAfterLabel should be empty when 'required' is false", () => {
+    const {
+      textAfterLabel,
+    } = LabelAPI({ required: false, label: "Aloha" });
+
+    expect(textAfterLabel.value).toBe("");
+  });
+
+  it("textAfterLabel should be empty when 'label' is empty", () => {
+    const {
+      textAfterLabel,
+    } = LabelAPI({ required: false, label: "" });
+
+    expect(textAfterLabel.value).toBe("");
+  });
+
+  it("textAfterLabel should be asterisk when 'required' is true", () => {
+    const {
+      textAfterLabel,
+    } = LabelAPI({ required: true, label: "Aloha" });
+
+    expect(textAfterLabel.value).toBe("*");
+  });
+});