aloha-vue 1.0.301 → 1.0.303

package/docs/src/views/PageInputNumber/PageInputNumber.js

@@ -8,8 +8,9 @@ export default {
   data() {
     return {
       model1: 10,
-      model2: 11.2,
-      model3: undefined,
+      model2: 123,
+      model3: 321,
+      model4: 432,
     };
   },
   methods: {

package/docs/src/views/PageInputNumber/PageInputNumber.pug

@@ -1,52 +1,50 @@
 div
-  h1 Form element
-  h2 Input number
+  h1 Input number
+  h2 type "number"
   a-input-number(
     id="input1"
     v-model="model1"
-    type="integer-non-negative"
+    type="number"
     label="Input 1"
     :required="true"
     :step="2"
     errors="not valid"
   )
   div model1: {{ model1 }}
-  div
-    a-input-number(
-      id="input2"
-      v-model="model1"
-      type="integer-non-negative"
-      label="Input 1"
-      :required="true"
-      :step="2"
-      :disabled="true"
-    )
-
+  h2 type "integer-non-negative"
+  a-input-number(
+    id="input2"
+    v-model="model2"
+    type="integer-non-negative"
+    label="Input 2"
+    :required="true"
+    :step="2"
+    :disabled="true"
+  )
+  div model2: {{ model2 }}
+  h2 type "integer-positive"
+  a-input-number(
+    id="input3"
+    v-model="model3"
+    type="integer-positive"
+    label="Input 3"
+    :required="true"
+    :step="3"
+  )
+  div model3: {{ model3 }}
+  h2 type "integer"
+  a-input-number(
+    id="input4"
+    v-model="model4"
+    type="integer"
+    label="Input 4"
+    :required="true"
+    :step="4"
+  )
+  div model4: {{ model4 }}
   input(
     type="number"
   )
-  //h2 Textarea
-  //a-textarea(
-  //  id="textarea1"
-  //  v-model="model2"
-  //  type="text"
-  //  label="Textarea 1"
-  //  :required="true"
-  //  :is-scalable="true"
-  //)
-  //div model2:
-  //pre {{ model2 }}
-  //
-  //h2 Textarea 2
-  //  a-textarea(
-  //    id="textarea3"
-  //    v-model="model3"
-  //    type="text"
-  //    label="Textarea 2"
-  //    :required="true"
-  //  )
-  //  div model3:
-  //  pre {{ model3 }}
   button.a_btn.a_btn_primary() Temp
 
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "aloha-vue",
   "description": "Project aloha",
-  "version": "1.0.301",
+  "version": "1.0.303",
   "author": "Ilia Brykin",
   "scripts": {
     "build-icons": "node scriptsNode/iconsSvgToJs.js bootstrap3 && node scriptsNode/iconsSvgToJs.js bootstrap-1-9-1"

package/src/ALink/ALink.js

@@ -7,6 +7,7 @@ import AIcon from "../AIcon/AIcon";
 import ASpinner from "../ASpinner/ASpinner";
 import ATranslation from "../ATranslation/ATranslation";
 
+import ClickAPI from "./compositionAPI/ClickAPI";
 import LoadingAPI from "../AButton/comositionAPI/LoadingAPI";
 import TextAPI from "../AButton/comositionAPI/TextAPI";
 import TitleAPI from "../AButton/comositionAPI/TitleAPI";
@@ -136,7 +137,10 @@ export default {
       default: undefined,
     },
   },
-  setup(props) {
+  emits: [
+    "click",
+  ],
+  setup(props, context) {
     const {
       isTitleVisible,
     } = TitleAPI(props);
@@ -151,6 +155,10 @@ export default {
       isTextVisible,
     } = TextAPI(props);
 
+    const {
+      onClick,
+    } = ClickAPI(props, context);
+
     return {
       isLoadingLeft,
       isLoadingRight,
@@ -226,6 +234,7 @@ export default {
           },
         ],
         ariaDisabled: this.disabled,
+        onClick: this.onClick,
       }, CHILDREN);
     }
     if (this.to) {
@@ -241,6 +250,7 @@ export default {
           },
         ],
         ariaDisabled: this.disabled,
+        onClick: this.onClick,
       }, () => CHILDREN);
     }
   },

package/src/ALink/compositionAPI/ClickAPI.js

@@ -0,0 +1,29 @@
+import {
+  toRef,
+} from "vue";
+
+export default function ClickAPI(props, { emit }) {
+  const onClick = $event => {
+    const prevent = toRef(props, "prevent");
+    const stop = toRef(props, "stop");
+    const disabled = toRef(props, "disabled");
+
+    if (prevent.value) {
+      $event.preventDefault();
+    }
+    if (stop.value) {
+      $event.stopPropagation();
+    }
+    if (disabled.value) {
+      return;
+    }
+    emit("click", {
+      props,
+      $event,
+    });
+  };
+
+  return {
+    onClick,
+  };
+}

package/src/AMenu/AMenu.js

@@ -186,6 +186,7 @@ export default {
       clickMenuLink,
       closeAllPanels,
       panelParentsOpen,
+      setDefaultMenu,
       togglePanel,
     } = AMenuPanelsAPI(props, {
       dataProParent,
@@ -232,6 +233,7 @@ export default {
       modelSearch,
       panelParentsOpen,
       removeBodyClasses,
+      setDefaultMenu,
       toggleMenu,
       togglePanel,
       updateModelSearch,

package/src/AMenu/compositionAPI/AMenuPanelsAPI.js

@@ -121,6 +121,11 @@ export default function AMenuPanelsAPI(props, {
     }
   };
 
+  const setDefaultMenu = () => {
+    resetSearch();
+    panelParentsOpen.value = [];
+  };
+
   watch($router.currentRoute, () => {
     if (isMenuLinkClicked.value) {
       isMenuLinkClicked.value = false;
@@ -135,6 +140,7 @@ export default function AMenuPanelsAPI(props, {
     clickMenuLink,
     closeAllPanels,
     panelParentsOpen,
+    setDefaultMenu,
     togglePanel
   };
 }

package/src/ui/AInputNumber/AInputNumber.js

@@ -50,8 +50,8 @@ export default {
       type: String,
       required: false,
       default: "number",
-      validator: value => ["number", "integer-non-negative"].indexOf(value) !== -1,
-      // TODO: "integer", "integer-positive",  "float", "float-positiv", "float-non-negative"
+      validator: value => ["number", "integer-non-negative", "integer-positive", "integer"].indexOf(value) !== -1,
+      // TODO: "float", "float-positiv", "float-non-negative"
     },
     iconPrepend: {
       type: String,

package/src/ui/AInputNumber/compositionAPI/InputEventsAPI.js

@@ -82,6 +82,42 @@ export default function InputEventsAPI(props, {
       setCurrentValue(newValue);
       inputRef.value.value = newValue;
       // TODO: cursor position
+    } else if (type.value === "integer-positive") {
+      if (newValue === "0") {
+        newValue = null;
+      } else {
+        const matches = newValue.match(/\d+/g);
+        let extractedValue = 0;
+        if (matches !== null) {
+          extractedValue = parseInt(matches.join(""), 10);
+          extractedValue = Math.max(extractedValue, 1);
+          newValue = extractedValue;
+        } else {
+          newValue = null;
+        }
+      }
+
+      setCurrentValue(newValue);
+      inputRef.value.value = newValue;
+    } else if (type.value === "integer") {
+      const matches = newValue.match(/\d+/g);
+      let extractedValue = 0;
+      if (matches !== null) {
+        extractedValue = parseInt(matches.join(""), 10);
+        if (newValue.indexOf("-") !== -1) {
+          extractedValue = -extractedValue;
+        }
+        newValue = extractedValue;
+        setCurrentValue(newValue);
+        inputRef.value.value = newValue;
+      } else if (newValue === "-") {
+        newValue = "-";
+        inputRef.value.value = newValue;
+      } else {
+        newValue = null;
+        setCurrentValue(newValue);
+        inputRef.value.value = newValue;
+      }
     }
   };
   const handleInputChange = $event => {

package/src/ui/AInputNumber/compositionAPI/MinAPI.js

@@ -5,6 +5,7 @@ import {
 
 import {
   isNil,
+  isUndefined,
 } from "lodash-es";
 
 export default function MinAPI(props) {
@@ -12,15 +13,17 @@ export default function MinAPI(props) {
   const min = toRef(props, "min");
 
   const minLocal = computed(() => {
+    let minComputed;
     if (type.value === "integer-non-negative") {
-      if (isNil(min.value)) {
-        return 0;
-      }
-      if (min.value > 0) {
-        return min.value;
-      }
+      minComputed = 0;
+    } else if (type.value === "integer-positive") {
+      minComputed = 1;
     }
-    return undefined;
+    if (isUndefined(minComputed) ||
+      !isNil(min.value) && min.value > minComputed) {
+      minComputed = min.value;
+    }
+    return minComputed;
   });
 
   return {

package/src/ui/AUiComponents.js

@@ -19,6 +19,8 @@ export default {
   email: AInput,
   file: AInputFile,
   "integer-non-negative": AInputNumber,
+  "integer-positive": AInputNumber,
+  integer: AInputNumber,
   multiselect: ASelect,
   natural: AInput,
   number: AInputNumber,