@dative-gpi/foundation-shared-components 1.0.126-fix-imports → 1.0.126

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.
@@ -44,7 +44,7 @@
44
44
  name="default"
45
45
  :label="label"
46
46
  :icon="icon"
47
- :iconBis="endToday ? iconBis : null"
47
+ :iconBis="iconBis"
48
48
  :timeStart="epochToShortTimeOnlyFormat($props.start)"
49
49
  :timeEnd="epochToShortTimeOnlyFormat($props.end)"
50
50
  :variant="$props.variant"
@@ -120,20 +120,12 @@ export default defineComponent({
120
120
  return dayEnd.value - props.dayStart;
121
121
  });
122
122
 
123
- const startToday = computed(() => {
124
- return props.start >= props.dayStart;
125
- });
126
-
127
- const endToday = computed(() => {
128
- return props.end <= dayEnd.value;
129
- });
130
-
131
123
  const dayDurationOffset = computed(() => {
132
124
  return dayDuration.value - dayToMillisecond(1);
133
125
  });
134
126
 
135
127
  const leftPosition = computed(() => {
136
- if (!startToday.value) {
128
+ if (props.start < props.dayStart) {
137
129
  return 0;
138
130
  }
139
131
  return millisecondToDay(props.start - props.dayStart - dayDurationOffset.value) * 100;
@@ -144,10 +136,10 @@ export default defineComponent({
144
136
  let end = props.end - dayDurationOffset.value;
145
137
  if(props.variant === 'current' && dayEnd.value > props.now) {
146
138
  end = props.now;
147
- } else if (!endToday.value) {
139
+ } else if (props.end > dayEnd.value) {
148
140
  end = dayEnd.value - dayDurationOffset.value;
149
141
  }
150
- if (!startToday.value) {
142
+ if (props.start < props.dayStart) {
151
143
  start = props.dayStart;
152
144
  }
153
145
 
@@ -158,14 +150,12 @@ export default defineComponent({
158
150
  const style = computed((): StyleValue => {
159
151
  return {
160
152
  '--fs-agenda-event-left': `${leftPosition.value}%`,
161
- '--fs-agenda-event-border-width': startToday.value ? '3px' : '0px',
162
153
  };
163
154
  });
164
155
 
165
156
  return {
166
157
  style,
167
158
  width,
168
- endToday,
169
159
  epochToShortTimeOnlyFormat
170
160
  };
171
161
  }
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.126-fix-imports",
4
+ "version": "1.0.126",
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.126-fix-imports",
14
- "@dative-gpi/foundation-shared-services": "1.0.126-fix-imports"
13
+ "@dative-gpi/foundation-shared-domain": "1.0.126",
14
+ "@dative-gpi/foundation-shared-services": "1.0.126"
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": "a33ad553014a5e4bec951107b73444080b2d7dd5"
38
+ "gitHead": "fa74ceb5e1e68ec7e0cf75fd43bdaf014f0ab552"
39
39
  }
@@ -8,7 +8,7 @@
8
8
  }
9
9
 
10
10
  >.fs-card {
11
- border-left: solid var(--fs-agenda-event-border-width) var(--fs-clickable-border-color) !important;
11
+ border-left: solid 3px var(--fs-clickable-border-color) !important;
12
12
  }
13
13
  }
14
14