@awes-io/ui 2.92.0 → 2.93.1

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.
package/CHANGELOG.md CHANGED
@@ -3,6 +3,34 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [2.93.1](https://github.com/awes-io/client/compare/@awes-io/ui@2.93.0...@awes-io/ui@2.93.1) (2024-02-02)
7
+
8
+
9
+ ### Bug Fixes
10
+
11
+ * fix href in mobile menu item ([6c869e8](https://github.com/awes-io/client/commit/6c869e8d17f2650fb69cf25ee8019c9ab965636f))
12
+ * mobile menu items count fixed ([ff4fd20](https://github.com/awes-io/client/commit/ff4fd20c8608b4af27eb288e8e320d9fef323e90))
13
+
14
+
15
+
16
+
17
+
18
+ # [2.93.0](https://github.com/awes-io/client/compare/@awes-io/ui@2.92.0...@awes-io/ui@2.93.0) (2024-02-01)
19
+
20
+
21
+ ### Bug Fixes
22
+
23
+ * release fixes ([fae62d8](https://github.com/awes-io/client/commit/fae62d8883f56900794dfe54d1c433b10700cb74))
24
+
25
+
26
+ ### Features
27
+
28
+ * add header slot for modal ([65b06f9](https://github.com/awes-io/client/commit/65b06f95372628dac9e8a39523219297550f4eed))
29
+
30
+
31
+
32
+
33
+
6
34
  # [2.92.0](https://github.com/awes-io/client/compare/@awes-io/ui@2.91.1...@awes-io/ui@2.92.0) (2024-01-29)
7
35
 
8
36
 
@@ -12,16 +12,12 @@
12
12
  padding: 0;
13
13
  }
14
14
 
15
- &__toggler,
16
- &__toggler > span {
17
- @apply text-mono-400;
15
+ &__toggler {
16
+ @apply bg-mono-900 text-mono-400;
17
+
18
18
  display: flex;
19
19
  align-items: center;
20
20
  justify-content: center;
21
- }
22
-
23
- &__toggler {
24
- @apply bg-mono-900;
25
21
 
26
22
  position: relative;
27
23
  white-space: nowrap;
@@ -50,17 +46,20 @@
50
46
  }
51
47
 
52
48
  &__toggler > span {
49
+ @apply text-mono-400;
50
+
53
51
  display: flex;
54
52
  align-items: center;
55
53
  justify-content: center;
56
54
 
57
- height: 2.75rem;
55
+ min-height: 2.75rem;
58
56
  min-width: 6.25rem;
57
+ height: 100%;
59
58
  width: 100%;
60
59
  border-radius: 0.5rem;
61
60
 
62
- padding-left: 0.5rem;
63
- padding-right: 0.5rem;
61
+ padding-left: 1.5rem;
62
+ padding-right: 1.5rem;
64
63
  }
65
64
 
66
65
  &__toggler:focus,
@@ -139,19 +138,6 @@
139
138
  }
140
139
  }
141
140
 
142
- &__arrow-btn.aw-button.theme-ghost {
143
- align-items: center;
144
-
145
- width: 2.5rem;
146
- height: 2.5rem;
147
-
148
- border-radius: 0.625rem;
149
-
150
- .aw-button__overlay {
151
- border-radius: 0.625rem;
152
- }
153
- }
154
-
155
141
  &--pagination {
156
142
  .aw-button-nav {
157
143
  &__toggler {
@@ -169,7 +155,7 @@
169
155
  }
170
156
 
171
157
  & > span {
172
- height: 2.375rem;
158
+ min-height: 2.375rem;
173
159
  border-radius: 0.5625rem;
174
160
  min-width: 0;
175
161
  width: 2.6rem;
@@ -221,7 +207,7 @@
221
207
 
222
208
  & > span {
223
209
  border-radius: 0.5rem;
224
- height: 2.25rem;
210
+ min-height: 2.25rem;
225
211
  }
226
212
  }
227
213
 
@@ -7,7 +7,7 @@
7
7
  line-height: 1rem;
8
8
  font-weight: bold;
9
9
  padding: 0 1.5rem;
10
- margin-bottom: 1rem;
10
+ margin-bottom: 1.5rem;
11
11
  }
12
12
 
13
13
  ol, ul {
@@ -57,17 +57,17 @@ $modal-aside-width-large: 75vw;
57
57
  }
58
58
 
59
59
  &__close {
60
- margin-left: auto;
61
60
  width: 3rem;
62
61
  height: 3rem;
63
62
  }
64
63
 
65
64
  &__title {
66
- @apply m-0 pr-6 text-left leading-tight font-heading truncate;
65
+ @apply my-0 ml-0 pr-6 text-left leading-tight font-heading truncate;
67
66
 
68
67
  font-size: 1.25rem;
69
68
  line-height: 1.5rem;
70
69
  font-weight: 700;
70
+ margin-right: auto;
71
71
  }
72
72
 
73
73
  &__subtitle {
@@ -61,6 +61,10 @@
61
61
  &--reverse {
62
62
  order: -1;
63
63
  }
64
+
65
+ &--column:empty {
66
+ display: none;
67
+ }
64
68
  }
65
69
 
66
70
  &__top-scroll-mark {
@@ -79,3 +79,24 @@ export function getLayout(context) {
79
79
 
80
80
  return 'default'
81
81
  }
82
+
83
+ /**
84
+ * Merges vue-router routes recursively
85
+ * @param {Array} existingRoutes
86
+ * @param {Array} newRoutes
87
+ */
88
+ export function mergeRoutes(existingRoutes, newRoutes) {
89
+ newRoutes.forEach(newRoute => {
90
+ const existing = existingRoutes.find(
91
+ ({ path }) => path === newRoute.path
92
+ )
93
+
94
+ if (existing && existing.children) {
95
+ return mergeRoutes(existing.children, newRoute.children)
96
+ }
97
+
98
+ if (!existing) {
99
+ existingRoutes.push(newRoute)
100
+ }
101
+ })
102
+ }
@@ -43,7 +43,7 @@
43
43
  import { viewOr, lensProp, omit } from 'rambdax'
44
44
  import AwMenuItemIcon from '@AwLayouts/_AwMenuItemIcon.vue'
45
45
 
46
- const VISIBLE_ITEMS_COUNT = 4
46
+ export const VISIBLE_ITEMS_COUNT = 4
47
47
 
48
48
  const ICON_SIZE = 28
49
49
 
@@ -23,23 +23,29 @@
23
23
  <div :class="elClasses.dialog" role="document">
24
24
  <!-- header -->
25
25
  <div ref="header" tabindex="-1" :class="elClasses.header">
26
- <div :class="elClasses.title">
27
- {{ title }}
28
- </div>
29
-
30
- <AwButton
31
- v-if="!notClosing"
32
- :class="elClasses.close"
33
- :title="$t('Close')"
34
- :aria-label="$t('Close')"
35
- color="mono-light"
36
- tabindex="0"
37
- @click.prevent="close()"
38
- >
39
- <template #icon>
40
- <AwIconSystemMono name="close" size="16" />
41
- </template>
42
- </AwButton>
26
+ <slot name="header" :title="title" :close="close">
27
+ <slot name="before-title" />
28
+
29
+ <div :class="elClasses.title">
30
+ {{ title }}
31
+ </div>
32
+
33
+ <slot name="after-title" />
34
+
35
+ <AwButton
36
+ v-if="!notClosing"
37
+ :class="elClasses.close"
38
+ :title="$t('Close')"
39
+ :aria-label="$t('Close')"
40
+ color="mono-light"
41
+ tabindex="0"
42
+ @click.prevent="close()"
43
+ >
44
+ <template #icon>
45
+ <AwIconSystemMono name="close" size="16" />
46
+ </template>
47
+ </AwButton>
48
+ </slot>
43
49
  </div>
44
50
  <!-- / header -->
45
51
 
@@ -7,9 +7,8 @@
7
7
  v-if="backUrl || isMenuToggler"
8
8
  class="aw-page-headline__back"
9
9
  color="mono"
10
- :href="backUrl"
10
+ :href="backUrl || '/more'"
11
11
  :aria-label="isMenuToggler ? $t('Menu') : breadcrumb.title"
12
- v-on="isMenuToggler ? { click: openMenu } : null"
13
12
  >
14
13
  <template #icon>
15
14
  <AwIconSystemMono name="arrow" />
@@ -134,12 +133,6 @@ export default {
134
133
  isMenuToggler() {
135
134
  return !this.backUrl && !this.$screen.lg && this.breadcrumbMenu
136
135
  }
137
- },
138
-
139
- methods: {
140
- openMenu() {
141
- this.$store.commit('awesIo/TOGGLE_MOBILE_MENU', true)
142
- }
143
136
  }
144
137
  }
145
138
  </script>
@@ -23,22 +23,10 @@
23
23
  (item.isDivide || allDivides) && i
24
24
  }
25
25
  ]"
26
- :href="_getChildrenCount(item) ? null : item.href"
26
+ :href="item.href"
27
27
  :arrow="checkShowArrow(item)"
28
28
  :active="isActive(item)"
29
- v-on="
30
- _getChildrenCount(item)
31
- ? {
32
- click: () =>
33
- $emit(
34
- 'click:submenu',
35
- item.children,
36
- item.subtitle || item.text,
37
- item.href
38
- )
39
- }
40
- : item.listeners || null
41
- "
29
+ v-on="item.listeners || null"
42
30
  />
43
31
  </li>
44
32
  </slot>
package/nuxt/index.js CHANGED
@@ -11,7 +11,7 @@ import {
11
11
  notify as configNotify
12
12
  } from './awes.config.js'
13
13
  import defaultTailwindConfig from '../tailwind.config.js'
14
- import { mergeRoutes } from '@awes-io/nuxt-admin/src/utils/merge-routes'
14
+ import { mergeRoutes } from '../assets/js/router.js'
15
15
 
16
16
  const DEFAULT_DAYJS_LOCALE = 'en'
17
17
 
@@ -97,11 +97,12 @@
97
97
  </template>
98
98
 
99
99
  <script>
100
- import { mapGetters } from 'vuex'
100
+ import { mapState, mapGetters } from 'vuex'
101
101
  import { lensProp, pathOr, viewOr } from 'rambdax'
102
102
 
103
103
  import AwMobileMenuNav from '@AwLayouts/_AwMobileMenuNav.vue'
104
104
  import AwMobileMenuItem from '@AwLayouts/_AwMobileMenuItem.vue'
105
+ import { VISIBLE_ITEMS_COUNT } from '@AwOrganisms/AwBottomBar.vue'
105
106
 
106
107
  export default {
107
108
  name: 'More',
@@ -120,6 +121,10 @@ export default {
120
121
  },
121
122
 
122
123
  computed: {
124
+ ...mapState('awesIo', [
125
+ 'bottomBarAction'
126
+ ]),
127
+
123
128
  ...mapGetters('awesIo', [
124
129
  'user',
125
130
  'logoComponent',
@@ -131,10 +136,14 @@ export default {
131
136
  return pathOr(null, 'awesIo.profileUrl', this.$store.state)
132
137
  },
133
138
 
139
+ menuItemsStartIndex() {
140
+ return VISIBLE_ITEMS_COUNT - (this.bottomBarAction ? 1 : 0)
141
+ },
142
+
134
143
  mainMenu() {
135
144
  return viewOr([], lensProp('mainMenu'), this.layoutProvider).filter(
136
145
  ({ is }) => !is
137
- )
146
+ ).slice(this.menuItemsStartIndex)
138
147
  },
139
148
 
140
149
  secondaryMenu() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@awes-io/ui",
3
- "version": "2.92.0",
3
+ "version": "2.93.1",
4
4
  "description": "User Interface (UI) components",
5
5
  "keywords": [
6
6
  "ui",
@@ -114,5 +114,5 @@
114
114
  "rollup-plugin-visualizer": "^2.6.0",
115
115
  "rollup-plugin-vue": "^5.0.1"
116
116
  },
117
- "gitHead": "eb28d05b048c7d2545694dbf4ac607e0267971d0"
117
+ "gitHead": "b0d964869b63efa892956efeb0b0c5b537db5933"
118
118
  }