aloha-vue 1.0.285 → 1.0.287

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

@@ -8,6 +8,7 @@ div
     label="Input 1"
     :required="true"
     :step="0.1"
+    errors="not valid"
   )
   div model1: {{ model1 }}
 

package/package.json

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

package/src/AIcon/Icons/Close.js

@@ -1,23 +1,3 @@
-export default `<svg
-  xmlns="http://www.w3.org/2000/svg"
-  viewBox="0 0 18 18"
-  height="18"
-  width="18"
->
-  <g
-    transform="matrix(0.79646021,-0.79646021,0.79646021,0.79646021,-5.3362832,9.0000003)"
-  >
-    <rect
-      width="4.599999"
-      height="18"
-      x="6.7000003"
-      y="-5e-07"
-    />
-    <rect
-      width="17.999996"
-      height="4.5999999"
-      x="5e-07"
-      y="6.6999998"
-    />
-  </g>
+export default `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-x-lg" viewBox="0 0 16 16">
+  <path d="M2.146 2.854a.5.5 0 1 1 .708-.708L8 7.293l5.146-5.147a.5.5 0 0 1 .708.708L8.707 8l5.147 5.146a.5.5 0 0 1-.708.708L8 8.707l-5.146 5.147a.5.5 0 0 1-.708-.708L7.293 8 2.146 2.854Z"/>
 </svg>`;

package/src/AIcon/Icons/Minus.js

@@ -1,14 +1,3 @@
-export default `<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="18"
-  height="18"
-  viewBox="0 0 18 18"
->
-  <g
-    transform="matrix(0.01757812,0,0,0.01757812,-1.7577055e-5,7.5671054e-6)"
-  >
-    <path
-      d="m 56.889,341.333 h 910.224 q 23.893,0 40.391,16.497 16.498,16.497 16.497,40.391 v 227.556 q 0,23.893 -16.497,40.391 -16.497,16.498 -40.391,16.497 H 56.889 q -23.893,0 -40.391,-16.497 Q 0,649.671 0.001,625.777 V 398.221 q 0,-23.893 16.497,-40.391 16.497,-16.498 40.391,-16.497 z"
-    />
-  </g>
+export default `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-dash-lg" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M2 8a.5.5 0 0 1 .5-.5h11a.5.5 0 0 1 0 1h-11A.5.5 0 0 1 2 8Z"/>
 </svg>`;

package/src/AIcon/Icons/Plus.js

@@ -1,14 +1,3 @@
-export default `<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="18"
-  height="18"
-  viewBox="0 0 18 18"
->
-  <g
-    transform="matrix(0.01757811,0,0,0.01757811,0,-1.757811e-5)"
-  >
-    <path
-      d="m 418.909,0.001 h 186.183 q 19.549,0 33.047,13.498 13.498,13.498 13.498,33.047 v 325.819 h 325.819 q 19.549,0 33.047,13.498 13.498,13.498 13.498,33.047 v 186.183 q 0,19.549 -13.498,33.047 -13.498,13.498 -33.047,13.498 H 651.637 v 325.819 q 0,19.549 -13.498,33.047 -13.498,13.498 -33.047,13.498 H 418.909 q -19.549,0 -33.047,-13.498 -13.498,-13.498 -13.498,-33.047 V 651.638 H 46.545 q -19.549,0 -33.047,-13.498 Q 0,624.642 0,605.093 V 418.91 Q 0,399.361 13.498,385.863 26.996,372.365 46.545,372.365 H 372.364 V 46.546 q 0,-19.549 13.498,-33.047 Q 399.36,0.001 418.909,0.001 Z"
-    />
-  </g>
+export default `<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-plus-lg" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M8 2a.5.5 0 0 1 .5.5v5h5a.5.5 0 0 1 0 1h-5v5a.5.5 0 0 1-1 0v-5h-5a.5.5 0 0 1 0-1h5v-5A.5.5 0 0 1 8 2Z"/>
 </svg>`;

package/src/styles/components/ui/AInputNumber.scss

@@ -1,6 +1,9 @@
 .a_form_element_number_controls {
-  display: inline-flex;
+  display: flex;
   align-items: stretch;
+  .a_form_element {
+    width: 100%;
+  }
   .a_btn_group {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0;
@@ -21,6 +24,12 @@
   }
 }
 
+.a_form_element__parent_invalid {
+  .a_form_element_number_controls .a_btn_group > .aloha_btn {
+    --a_btn_border_color: var(--a_form_element_error_color);
+  }
+}
+
 .a_input_number {
   height: 100%;
   -webkit-appearance: none;

package/src/ui/AInputNumber/AInputNumber.js

@@ -217,6 +217,7 @@ export default {
           a_form_element__parent_float: this.isLabelFloat,
           a_form_element__parent_not_empty: this.isModel || this.isAutofill,
           a_form_element__parent_float_has_icon_prepend: this.iconPrepend,
+          a_form_element__parent_invalid: this.isErrors,
         }],
       }, [
         this.label && h(ALabel, {

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

@@ -16,6 +16,7 @@ export default function InputEventsAPI(props, {
   onBlur = () => {},
   setCurrentValue = () => {},
   userInput = ref(null),
+  currentValue = ref(undefined),
   displayValue = computed(() => ""),
 }) {
   const eAllowed = toRef(props, "eAllowed");
@@ -58,7 +59,6 @@ export default function InputEventsAPI(props, {
 
   const handleInput = $event => {
     const value = $event.target.value;
-    console.log("value", value);
     userInput.value = value;
     const newVal = value === "" ? null : Number(value);
     setCurrentValue(newVal, false);
@@ -102,8 +102,10 @@ export default function InputEventsAPI(props, {
   };
 
   const onBlurNumber = $event => {
-    console.log("onBlurNumber");
-    if (!modelValue.value && modelValue.value !== 0) {
+    if (userInput.value !== null ||
+      (!modelValue.value && modelValue.value !== 0)) {
+      userInput.value = null;
+      currentValue.value = modelValue.value;
       inputRef.value.value = displayValue.value;
     }
     onBlur($event);