@dative-gpi/foundation-shared-components 1.0.116 → 1.0.117

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -9,10 +9,10 @@
9
9
  <FSRow
10
10
  align="center-center"
11
11
  >
12
- <FSIcon
12
+ <FSIcon
13
13
  :variant="$props.iconVariant"
14
14
  :color="$props.iconColor"
15
- :size="$props.iconSize"
15
+ :size="actualIconSize"
16
16
  >
17
17
  {{ $props.icon }}
18
18
  </FSIcon>
@@ -21,10 +21,12 @@
21
21
  </template>
22
22
 
23
23
  <script lang="ts">
24
- import { defineComponent, type PropType } from "vue";
24
+ import { defineComponent, type PropType, computed } from "vue";
25
25
 
26
26
  import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
27
27
 
28
+ import { sizeToVar } from "../utils";
29
+
28
30
  import FSCard from "./FSCard.vue";
29
31
  import FSIcon from "./FSIcon.vue";
30
32
 
@@ -68,13 +70,28 @@ export default defineComponent({
68
70
  iconSize: {
69
71
  type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
70
72
  required: false,
71
- default: "42px"
73
+ default: null
72
74
  },
73
75
  border: {
74
76
  type: Boolean,
75
77
  required: false,
76
78
  default: true
77
79
  }
80
+ },
81
+ setup(props){
82
+ const actualIconSize = computed(() => {
83
+ if (props.iconSize){
84
+ return props.iconSize;
85
+ }
86
+ else if (props.size) {
87
+ return `calc(${sizeToVar(props.size)} * 0.42)`;
88
+ }
89
+ return "42px";
90
+ });
91
+
92
+ return {
93
+ actualIconSize
94
+ };
78
95
  }
79
96
  });
80
97
  </script>
@@ -45,20 +45,20 @@
45
45
  </template>
46
46
  </FSCol>
47
47
  </FSFadeOut>
48
- <FSRow
48
+ <template
49
49
  v-else-if="$props.direction == 'row'"
50
50
  >
51
- <template
51
+ <FSRow
52
52
  v-if="$props.loading"
53
53
  >
54
54
  <FSLoader
55
55
  v-for="i in 4"
56
56
  :key="i"
57
- width="100%"
57
+ width="100px"
58
58
  height="50px"
59
59
  />
60
- </template>
61
- <template
60
+ </FSRow>
61
+ <FSRow
62
62
  v-else
63
63
  >
64
64
  <FSSimpleListItem
@@ -76,8 +76,8 @@
76
76
  @click:edit="$emit('click:edit', $event)"
77
77
  @click:remove="$emit('click:remove', $event)"
78
78
  />
79
- </template>
80
- </FSRow>
79
+ </FSRow>
80
+ </template>
81
81
  <FSSlideGroup
82
82
  v-else
83
83
  >
@@ -15,7 +15,7 @@
15
15
 
16
16
  <FSRow
17
17
  padding="24px 16px 16px 24px"
18
- style="position: sticky; top: 0px; z-index: 1;"
18
+ style="position: sticky; top: 0px; z-index: 2;"
19
19
  :style="{ backgroundColor, marginTop: $props.stickyTitleTopOffset }"
20
20
  >
21
21
  <slot
@@ -46,7 +46,7 @@
46
46
  <FSRow
47
47
  v-if="$slots.toolbar"
48
48
  padding="0px 16px 8px 24px"
49
- :style="stickyToolbar ? `position: sticky; top: ${$props.toolbarTopOffset}; z-index: 1; background-color: ${backgroundColor}` : undefined"
49
+ :style="stickyToolbar ? `position: sticky; top: ${$props.toolbarTopOffset}; z-index: 2; background-color: ${backgroundColor}` : undefined"
50
50
  >
51
51
  <FSSlideGroup
52
52
  width="100%"
@@ -32,8 +32,8 @@
32
32
  :backgroundColor="$props.iconBackgroundColors"
33
33
  :iconColor="$props.iconColor"
34
34
  :border="$props.iconBorder"
35
- :icon="$props.icon"
36
35
  :size="actualImageSize"
36
+ :icon="$props.icon"
37
37
  />
38
38
  <FSCol
39
39
  align="center-left"
@@ -15,7 +15,7 @@
15
15
 
16
16
  <FSRow
17
17
  padding="24px 16px 16px 24px"
18
- style="position: sticky; top: 0px; z-index: 1;"
18
+ style="position: sticky; top: 0px; z-index: 2;"
19
19
  :style="{ backgroundColor, marginTop: $props.stickyTitleTopOffset }"
20
20
  >
21
21
  <slot
@@ -46,7 +46,7 @@
46
46
  <FSRow
47
47
  v-if="$slots.toolbar"
48
48
  padding="0px 16px 8px 24px"
49
- :style="stickyToolbar ? `position: sticky; top: ${$props.toolbarTopOffset}; z-index: 1; background-color: ${backgroundColor}` : undefined"
49
+ :style="stickyToolbar ? `position: sticky; top: ${$props.toolbarTopOffset}; z-index: 2; background-color: ${backgroundColor}` : undefined"
50
50
  >
51
51
  <FSSlideGroup>
52
52
  <slot
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@dative-gpi/foundation-shared-components",
3
3
  "sideEffects": false,
4
- "version": "1.0.116",
4
+ "version": "1.0.117",
5
5
  "description": "",
6
6
  "publishConfig": {
7
7
  "access": "public"
@@ -10,8 +10,8 @@
10
10
  "author": "",
11
11
  "license": "ISC",
12
12
  "dependencies": {
13
- "@dative-gpi/foundation-shared-domain": "1.0.116",
14
- "@dative-gpi/foundation-shared-services": "1.0.116"
13
+ "@dative-gpi/foundation-shared-domain": "1.0.117",
14
+ "@dative-gpi/foundation-shared-services": "1.0.117"
15
15
  },
16
16
  "peerDependencies": {
17
17
  "@dative-gpi/bones-ui": "^1.0.0",
@@ -35,5 +35,5 @@
35
35
  "sass": "1.71.1",
36
36
  "sass-loader": "13.3.2"
37
37
  },
38
- "gitHead": "3c68bcc5adea7b444e566b7363d680b64a7f6b21"
38
+ "gitHead": "2ebf4b9959a5da859e4c9086262b0772338a62c0"
39
39
  }