aloha-vue 1.2.243 → 1.2.245

package/package.json

@@ -14,7 +14,7 @@
     "Vue.js"
   ],
   "homepage": "https://github.com/ilia-brykin/aloha/#README.md",
-  "version": "1.2.243",
+  "version": "1.2.245",
   "author": {
     "name": "Ilia Brykin",
     "email": "brykin.ilia@gmail.com"

package/src/AModalWizard/AModalWizard.js

@@ -359,8 +359,12 @@ export default {
           round: [],
         };
 
-        if (props.type in validSubTypes) {
-          return isNil(value) || validSubTypes[props.type].indexOf(value) !== -1;
+        if (props) {
+          if (props.type in validSubTypes) {
+            return isNil(value) || validSubTypes[props.type].indexOf(value) !== -1;
+          }
+        } else {
+          return ["square", "circle", "square-bordered", "circle-bordered"].indexOf(value) !== -1;
         }
 
         return false;

package/src/ATable/ATable.js

@@ -243,6 +243,15 @@ export default {
       type: Boolean,
       required: false,
     },
+    isTreeCollapsible: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+    isTreeOpened: {
+      type: Boolean,
+      required: false,
+    },
     keyCountAllRowsInData: {
       type: String,
       required: false,
@@ -971,6 +980,8 @@ export default {
                     isPreviewDownOpen: this.previewDownRowIds[ROW_ID],
                     isRowActionsStickyLocal: this.isRowActionsStickyLocal,
                     isTree: this.isTree,
+                    isTreeCollapsible: this.isTreeCollapsible,
+                    isTreeOpened: this.isTreeOpened,
                     keyChildren: this.keyChildren,
                     keyId: this.keyId,
                     level: 1,
@@ -1019,6 +1030,8 @@ export default {
                   isFooter: true,
                   isRowActionsStickyLocal: this.isRowActionsStickyLocal,
                   isTree: this.isTree,
+                  isTreeCollapsible: this.isTreeCollapsible,
+                  isTreeOpened: this.isTreeOpened,
                   keyChildren: this.keyChildren,
                   keyId: this.keyId,
                   level: 1,

package/src/ATable/ATableTr/ATableTr.js

@@ -77,6 +77,15 @@ export default {
       type: Boolean,
       required: false,
     },
+    isTreeCollapsible: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+    isTreeOpened: {
+      type: Boolean,
+      required: false,
+    },
     keyChildren: {
       type: String,
       required: false,
@@ -132,6 +141,7 @@ export default {
 
     const {
       ariaExpanded,
+      initIsChildrenOpen,
       isOneOfParentsCloseForChildren,
       rowClassChildren,
       toggleChildren,
@@ -177,6 +187,8 @@ export default {
       toggleCheckbox,
     } = CheckboxAPI(props, context);
 
+    initIsChildrenOpen();
+
     return {
       ariaExpanded,
       ariaTreeAttributes,
@@ -239,7 +251,7 @@ export default {
           row: this.row,
           rowIndex: this.rowIndex,
           isFooter: this.isFooter,
-          showIconChildren: !!(this.hasChildren && columnIndex === 0),
+          showIconChildren: !!(this.isTreeCollapsible && this.hasChildren && columnIndex === 0),
         }, this.$slots);
       });
     }
@@ -267,13 +279,15 @@ export default {
             isFooter: this.isFooter,
           }) :
           "",
-        this.hasChildren && h(AElement, {
-          "aria-hidden": true,
-          class: "a_table__row_level__icon",
-          classDefault: "",
-          iconLeft: "CaretRightFill",
-          type: "text",
-        }),
+        (this.isTreeCollapsible && this.hasChildren) ?
+          h(AElement, {
+            "aria-hidden": true,
+            class: "a_table__row_level__icon",
+            classDefault: "",
+            iconLeft: "CaretRightFill",
+            type: "text",
+          }) :
+          "",
         h("dl", {
           class: "a_table_mobile__dl",
         }, tds),
@@ -351,6 +365,8 @@ export default {
             isPreviewDownOpen: false,
             isRowActionsStickyLocal: this.isRowActionsStickyLocal,
             isTree: this.isTree,
+            isTreeCollapsible: this.isTreeCollapsible,
+            isTreeOpened: this.isTreeOpened,
             keyChildren: this.keyChildren,
             keyId: this.keyId,
             level: this.levelForChildren,

package/src/ATable/ATableTr/compositionAPI/AttributesAPI.js

@@ -23,6 +23,7 @@ export default function AttributesAPI(props, {
   const disabledPreview = toRef(props, "disabledPreview");
   const disabledPreviewRowCallback = toRef(props, "disabledPreviewRowCallback");
   const isFooter = toRef(props, "isFooter");
+  const isTreeCollapsible = toRef(props, "isTreeCollapsible");
   const row = toRef(props, "row");
   const rowClass = toRef(props, "rowClass");
   const rowIndex = toRef(props, "rowIndex");
@@ -97,7 +98,9 @@ export default function AttributesAPI(props, {
   };
 
   const eventsLocal = computed(() => {
-    if ((hasChildren.value || hasPreviewLocal.value) && !disabledPreviewRow.value) {
+    if (((isTreeCollapsible.value && hasChildren.value)
+      || hasPreviewLocal.value) &&
+      !disabledPreviewRow.value) {
       return {
         tabindex: 0,
         onClick: onClickRow,

package/src/ATable/ATableTr/compositionAPI/ChildrenToggleAPI.js

@@ -7,6 +7,8 @@ export default function ChildrenToggleAPI(props, {
   hasChildren = computed(() => false),
 }) {
   const isOneOfParentsClose = toRef(props, "isOneOfParentsClose");
+  const isTreeCollapsible = toRef(props, "isTreeCollapsible");
+  const isTreeOpened = toRef(props, "isTreeOpened");
 
   const isChildrenOpen = ref(false);
 
@@ -34,9 +36,16 @@ export default function ChildrenToggleAPI(props, {
     isChildrenOpen.value = !isChildrenOpen.value;
   };
 
+  const initIsChildrenOpen = () => {
+    if (!isTreeCollapsible.value || isTreeOpened.value) {
+      isChildrenOpen.value = true;
+    }
+  };
+
 
   return {
     ariaExpanded,
+    initIsChildrenOpen,
     isOneOfParentsCloseForChildren,
     rowClassChildren,
     toggleChildren,

package/src/AWizard/AWizard.js

@@ -243,8 +243,12 @@ export default {
           round: [],
         };
 
-        if (props.type in validSubTypes) {
-          return isNil(value) || validSubTypes[props.type].indexOf(value) !== -1;
+        if (props) {
+          if (props.type in validSubTypes) {
+            return isNil(value) || validSubTypes[props.type].indexOf(value) !== -1;
+          }
+        } else {
+          return ["square", "circle", "square-bordered", "circle-bordered"].indexOf(value) !== -1;
         }
 
         return false;

package/src/styles/components/AModal.scss

@@ -27,3 +27,8 @@
     padding-bottom: var(--a_modal_padding);
   }
 }
+.a_modal_footer_actions {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}