@dative-gpi/foundation-shared-components 1.0.138 → 1.0.139-editablerefacto

package/components/lists/FSDataTableUI.vue

@@ -112,7 +112,7 @@
             :label="$tr('data-table.reset-filters', 'Reset')"
             :height="['30px', '24px']"
             :color="ColorEnum.Error"
-            :editable="true"
+            :clickable="true"
             @click="resetFilter"
           />
           <FSHiddenButton
@@ -478,18 +478,20 @@
               >
                 <FSDataIteratorItem
                   v-if="item.type === 'item'"
-                  :itemColor="$props.rowColor ? $props.rowColor(item.raw) : ColorEnum.Background"
+                  :leftColor="$props.rowColor ? $props.rowColor(item.raw) : null"
                   :headers="innerHeaders.filter(h => !$props.sneakyHeaders.includes(h.value))"
-                  :clickable="onClickLibrary.clickable"
-                  :showSelect="$props.showSelect"
-                  :itemTo="$props.itemTo"
-                  :color="$props.color"
+                  :selectable="$props.showSelect"
+                  :singleSelect="$props.singleSelect"
+                  :to="$props.itemTo"
+                  :bottomColor="$props.color"
                   :item="item.raw"
                   :key="index"
-                  :modelValue="$props.modelValue.includes(item.raw[$props.itemValue])"
-                  @update:modelValue="toggleSelect"
-                  @auxclick="() => onClickLibrary.mobile($event, item)"
-                  @click="() => onClickLibrary.mobile($event, item)"
+                  :modelValue="$props.modelValue?.includes(item.raw[$props.itemValue])"
+                  @update:modelValue="toggleSelect(item.raw)"
+                  v-bind="onClickLibrary.clickable ? {
+                    onClick: (event) => onClickLibrary.mobile(event, item),
+                    onAuxclick: (event) => onClickLibrary.mobile(event, item)
+                  } : {}"
                 >
                   <template
                     #item.top="props"
@@ -649,18 +651,20 @@
                 v-bind="{ index, item: item.raw, toggleSelect }"
               >
                 <FSDataIteratorItem
-                  :itemColor="$props.rowColor ? $props.rowColor(item.raw) : ColorEnum.Background"
+                  :leftColor="$props.rowColor ? $props.rowColor(item.raw) : null"
                   :headers="innerHeaders.filter(h => !$props.sneakyHeaders.includes(h.value))"
-                  :clickable="onClickLibrary.clickable"
-                  :showSelect="$props.showSelect"
-                  :itemTo="$props.itemTo"
-                  :color="$props.color"
+                  :selectable="$props.showSelect"
+                  :singleSelect="$props.singleSelect"
+                  :to="$props.itemTo"
+                  :bottomColor="$props.color"
                   :item="item.raw"
                   :key="index"
-                  :modelValue="$props.modelValue.includes(item.raw[$props.itemValue])"
-                  @update:modelValue="toggleSelect"
-                  @auxclick="() => onClickLibrary.mobile($event, item)"
-                  @click="() => onClickLibrary.mobile($event, item)"
+                  :modelValue="$props.modelValue?.includes(item.raw[$props.itemValue])"
+                  @update:modelValue="toggleSelect(item.raw)"
+                  v-bind="onClickLibrary.clickable ? {
+                    onClick: (event) => onClickLibrary.mobile(event, item),
+                    onAuxclick: (event) => onClickLibrary.mobile(event, item)
+                  } : {}"
                 >
                   <template
                     #item.top="props"
@@ -1126,6 +1130,7 @@ export default defineComponent({
     });
 
     const onClickLibrary = computed((): { [key: string]: Function | boolean } => {
+      console.log(props["onClick:row"]);
       if (props["onClick:row"] || props.itemTo) {
         return {
           clickable: true,

package/components/lists/FSFilterButton.vue

@@ -12,7 +12,7 @@
         variant="standard"
         :height="['30px', '24px']"
         :color="ColorEnum.Dark"
-        :editable="true"
+        :clickable="true"
         :label="label"
         v-bind="props"
       />
@@ -40,7 +40,7 @@
             :height="['30px', '24px']"
             :variant="getAllVariant()"
             :color="$props.color"
-            :editable="true"
+            :clickable="true"
             @click="onToggleAll"
           />
           <FSDivider />
@@ -63,7 +63,7 @@
               :height="['30px', '24px']"
               :color="$props.color"
               :label="filter.text"
-              :editable="true"
+              :clickable="true"
               :key="index"
               @click="() => onToggle(filter)"
             >

package/components/lists/FSHeaderButton.vue

@@ -35,7 +35,7 @@
             variant="borderless"
             :label="$tr('data-table.hide-column', 'Hide column')"
             :height="[30, 24]"
-            :editable="true"
+            :clickable="true"
             @click="$emit('update:hide')"
           />
           <FSChip
@@ -45,7 +45,7 @@
             prependIcon="mdi-chevron-left"
             :label="$tr('data-table.move-left', 'Move to the left')"
             :height="[30, 24]"
-            :editable="true"
+            :clickable="true"
             @click="$emit('update:left')"
           />
           <FSChip
@@ -55,7 +55,7 @@
             prependIcon="mdi-chevron-right"
             :label="$tr('data-table.move-right', 'Move to the right')"
             :height="[30, 24]"
-            :editable="true"
+            :clickable="true"
             @click="$emit('update:right')"
           />
         </FSCol>

package/components/lists/FSHiddenButton.vue

@@ -10,7 +10,7 @@
         prependIcon="mdi-eye-off-outline"
         :height="[30, 24]"
         :color="ColorEnum.Light"
-        :editable="true"
+        :clickable="true"
         :label="$tr('data-table.hidden-columns', '{0} hidden column(s)', $props.headers.length.toString())"
         v-bind="props"
       />
@@ -46,7 +46,7 @@
               :height="['30px', '24px']"
               :color="$props.color"
               :label="header.text"
-              :editable="true"
+              :clickable="true"
               :key="index"
               @click="$emit('update:show', header)"
             >

package/components/lists/FSSimpleListItem.vue

@@ -3,7 +3,7 @@
     v-bind="$props.tileProps"
     :width="$props.width"
     height="fit-content"
-    :editable="false"
+    :selectable="false"
   >
     <slot
       name="item"

package/components/tiles/FSDeviceOrganisationTileUI.vue

@@ -2,7 +2,6 @@
   <FSTile
     :activeColor="ColorEnum.Primary"
     :bottomColor="ColorEnum.Primary"
-    :editable="$props.editable"
     :width="$props.width"
     :modelValue="$props.modelValue"
     v-bind="$attrs"
@@ -147,11 +146,6 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: false
-    },
-    editable: {
-      type: Boolean,
-      required: false,
-      default: true
     }
   },
   setup(props) {

package/components/tiles/FSGroupTileUI.vue

@@ -2,7 +2,6 @@
   <FSTile
     :activeColor="ColorEnum.Primary"
     :bottomColor="ColorEnum.Error"
-    :editable="$props.editable"
     :width="$props.width"
     :modelValue="$props.modelValue"
     v-bind="$attrs"
@@ -169,11 +168,6 @@ export default defineComponent({
       required: false,
       default: false
     },
-    editable: {
-      type: Boolean,
-      required: false,
-      default: true
-    },
     width: {
       type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
       required: false,

package/components/tiles/FSLoadTile.vue

@@ -40,7 +40,7 @@
       />
     </FSRow>
     <FSCard
-      v-if="$props.editable"
+      v-if="$props.selectable"
       class="fs-tile-checkbox"
       :height="['40px', '32px']"
       :width="['40px', '32px']"
@@ -48,6 +48,7 @@
     >
       <FSCheckbox
         :modelValue="$props.modelValue"
+        :disabled="true"
         @update:modelValue="() => $emit('update:modelValue', !$props.modelValue)"
       />
     </FSCard>
@@ -81,7 +82,7 @@ export default defineComponent({
       required: false,
       default: false
     },
-    editable: {
+    selectable: {
       type: Boolean,
       required: false,
       default: false

package/components/tiles/FSServiceAccountOrganisationTileUI.vue

@@ -1,7 +1,6 @@
 <template>
   <FSTile
     :activeColor="ColorEnum.Primary"
-    :editable="$props.editable"
     :width="$props.width"
     :modelValue="$props.modelValue"
     v-bind="$attrs"
@@ -108,11 +107,6 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: false
-    },
-    editable: {
-      type: Boolean,
-      required: false,
-      default: true
     }
   },
   setup(props) {

package/components/tiles/FSSimpleTileUI.vue

@@ -2,7 +2,6 @@
   <FSTile 
     :activeColor="$props.activeColor"
     :bottomColor="$props.bottomColor"
-    :editable="$props.editable"
     :width="$props.width"
     :modelValue="$props.modelValue"
     v-bind="$attrs"
@@ -136,11 +135,6 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: false
-    },
-    editable: {
-      type: Boolean,
-      required: false,
-      default: true
     }
   },
   setup(props) {

package/components/tiles/FSTile.vue

@@ -4,58 +4,53 @@
     :height="$props.height"
     :width="$props.width"
   >
-    <template
-      v-if="$props.editable"
+    <FSClickable
+      v-if="($props.href || $props.to || $attrs.onClick)"
+      variant="background"
+      class="fs-tile"
+      padding="12px"
+      :href="$props.href"
+      width="100%"
+      height="100%"
+      :to="$props.to"
+      :style="style"
+      :disabled="$props.disableClick"
+      v-bind="$attrs"
     >
-      <FSClickable
-        v-if="$props.singleSelect"
-        padding="12px"
-        :variant="variant"
-        :color="color"
-        :style="style"
-        width="100%"
-        height="100%"
-        @click="() => $emit('update:modelValue', !$props.modelValue)"
-        v-bind="$attrs"
-      >
-        <slot />
-      </FSClickable>
-      <FSClickable
-        v-else-if="$props.href || $props.to || $attrs.onClick"
-        variant="background"
-        class="fs-tile"
-        padding="12px"
-        :color="ColorEnum.Background"
-        :href="$props.href"
-        width="100%"
-        height="100%"
-        :to="$props.to"
-        :style="style"
-        v-bind="$attrs"
+      <slot />
+      <FSCard
+        v-if="$props.selectable"
+        class="fs-tile-checkbox"
+        :height="['40px', '32px']"
+        :width="['40px', '32px']"
+        :border="false"
       >
-        <slot />
-        <FSCard
-          v-if="$props.editable"
-          class="fs-tile-checkbox"
-          variant="background"
-          :height="['40px', '32px']"
-          :width="['40px', '32px']"
-          :border="false"
-          v-bind="$attrs"
-        >
-          <FSCheckbox
-            :modelValue="$props.modelValue"
-            @update:modelValue="() => $emit('update:modelValue', !$props.modelValue)"
-          />
-        </FSCard>
-      </FSClickable>
-    </template>
+        <FSCheckbox
+          :modelValue="$props.modelValue"
+          @update:modelValue="() => $emit('update:modelValue', !$props.modelValue)"
+        />
+      </FSCard>
+    </FSClickable>
+
+    <FSClickable
+      v-else-if="$props.selectable && $props.singleSelect"
+      padding="12px"
+      :variant="variant"
+      :color="color"
+      :style="style"
+      width="100%"
+      height="100%"
+      @click="() => $emit('update:modelValue', !$props.modelValue)"
+      v-bind="$attrs"
+    >
+      <slot />
+    </FSClickable>
+    
     <FSCard
       v-else
       variant="background"
       class="fs-tile"
       padding="12px"
-      :color="color"
       :style="style"
       width="100%"
       height="100%"
@@ -63,13 +58,12 @@
     >
       <slot />
       <FSCard
-        v-if="$props.editable"
+        v-if="$props.selectable"
         class="fs-tile-checkbox"
         variant="background"
         :height="['40px', '32px']"
         :width="['40px', '32px']"
         :border="false"
-        v-bind="$attrs"
       >
         <FSCheckbox
           :modelValue="$props.modelValue"
@@ -77,6 +71,7 @@
         />
       </FSCard>
     </FSCard>  
+    
     <div
       v-if="$props.leftColor"
       class="fs-tile-left"
@@ -139,7 +134,12 @@ export default defineComponent({
       required: false,
       default: null
     },
-    editable: {
+    selectable: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    disableClick: {
       type: Boolean,
       required: false,
       default: false

package/components/tiles/FSUserOrganisationTileUI.vue

@@ -1,7 +1,6 @@
 <template>
   <FSTile
     :activeColor="ColorEnum.Primary"
-    :editable="$props.editable"
     :width="$props.width"
     :modelValue="$props.modelValue"
     v-bind="$attrs"
@@ -114,11 +113,6 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: false
-    },
-    editable: {
-      type: Boolean,
-      required: false,
-      default: true
     }
   },
   setup(props) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "1.0.138",
+  "version": "1.0.139-editablerefacto",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.138",
-    "@dative-gpi/foundation-shared-services": "1.0.138"
+    "@dative-gpi/foundation-shared-domain": "1.0.139-editablerefacto",
+    "@dative-gpi/foundation-shared-services": "1.0.139-editablerefacto"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "ec1370eef99afdec2bd4425c7010c1012c23563e"
+  "gitHead": "08257373afc83e5ede9ca5d6743d38fd211beb96"
 }

package/styles/components/fs_chip.scss

@@ -9,7 +9,7 @@
     padding: 2px 20px !important;
 }
 
-.fs-chip-editable {
+.fs-chip-clickable {
     cursor: pointer !important;
 
     &:active {

package/styles/components/fs_draggable.scss

@@ -1,10 +1,5 @@
 .fs-draggable-item {
   transition: all 0.28s cubic-bezier(0.4, 0, 0.2, 1);
- 
-  &:has(.fs-data-iterator-item) {
-    flex: 1 1 0 !important;
-    width: 100% !important;
-  }
 }
 
 .fs-draggable-dragging {

package/styles/components/index.scss

@@ -19,7 +19,6 @@
 @import "fs_color.scss";
 @import "fs_color_icon.scss";
 @import "fs_data_table.scss";
-@import "fs_data_iterator_item.scss";
 @import "fs_dialog_menu.scss";
 @import "fs_dialog.scss";
 @import "fs_divider.scss";

package/styles/components/fs_data_iterator_item.scss

@@ -1,35 +0,0 @@
-.fs-data-iterator-item {
-    cursor: var(--fs-data-iterator-item-cursor);
-    position: relative;
-    min-height: 36px;
-    flex: 1 0 0;
-
-    & > .fs-col > .fs-row:first-of-type > :last-child {
-        padding-right: 32px;
-    }
-
-    @include clickscreen {
-        &:hover::after {
-            content: "";
-            background-color: black;
-            pointer-events: none;
-            position: absolute;
-            opacity: 0.04;
-            height: 100%;
-            width: 100%;
-            left: 0;
-            top: 0;
-        }
-    }
-}
-
-.fs-data-iterator-item-checkbox {
-    justify-content: center;
-    align-items: center;
-    position: absolute;
-    border-radius: 4px;
-    height: 32px;
-    width: 32px;
-    right: 1px;
-    top: 1px;
-}