Skip to content

Commit 4d03083

Browse files
authored
Merge branch 'next' into vue3/update-behaviour-of-GeoLocation
2 parents e3b64cd + 5a9954f commit 4d03083

File tree

5 files changed

+53
-38
lines changed

5 files changed

+53
-38
lines changed

package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/components/PolarContainer.ce.vue

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,17 @@
55
:lang="language"
66
:data-kern-theme="mainStore.colorScheme"
77
>
8-
<PolarMap />
9-
<PolarUI />
10-
<MoveHandle
11-
v-if="isActive && hasWindowSize && hasSmallWidth"
12-
:key="moveHandleKey"
13-
/>
8+
<div class="polar-map-layer">
9+
<PolarMap />
10+
</div>
11+
<div class="polar-ui-layer">
12+
<div v-if="!hasWindowSize" class="polar-shadow" aria-hidden="true" />
13+
<PolarUI />
14+
<MoveHandle
15+
v-if="isActive && hasWindowSize && hasSmallWidth"
16+
:key="moveHandleKey"
17+
/>
18+
</div>
1419
</div>
1520
</template>
1621

@@ -165,7 +170,6 @@ onBeforeUnmount(() => {
165170
width: 100%;
166171
height: 30em;
167172
border-radius: var(--kern-metric-border-radius-large);
168-
overflow: hidden;
169173
box-sizing: border-box;
170174
}
171175
}
@@ -176,5 +180,33 @@ onBeforeUnmount(() => {
176180
position: relative;
177181
height: 100%;
178182
width: 100%;
183+
border-radius: var(--kern-metric-border-radius-large);
184+
}
185+
186+
.polar-map-layer {
187+
position: absolute;
188+
inset: 0;
189+
z-index: 1;
190+
clip-path: inset(0 round var(--kern-metric-border-radius-large));
191+
}
192+
193+
.polar-shadow {
194+
position: absolute;
195+
inset: 0;
196+
border-radius: var(--kern-metric-border-radius-large);
197+
box-shadow:
198+
inset 0 1px 1px 0 rgba(53, 57, 86, 0.5),
199+
inset 0 1px 2px 0 rgba(53, 57, 86, 0.5),
200+
inset 0 1px 6px 0 rgba(110, 117, 151, 0.5);
201+
pointer-events: none;
202+
z-index: -1;
203+
}
204+
205+
.polar-ui-layer {
206+
position: absolute;
207+
inset: 0;
208+
z-index: 2;
209+
isolation: isolate;
210+
pointer-events: none;
179211
}
180212
</style>

src/core/components/PolarUI.ce.vue

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
<template>
2-
<div class="polar-ui" :class="{ 'polar-shadow': !hasWindowSize }">
2+
<div class="polar-ui">
33
<component :is="layout" />
44
</div>
55
</template>
66

77
<script lang="ts" setup>
8-
import { storeToRefs } from 'pinia'
98
import { computed } from 'vue'
109
1110
import { useMainStore } from '../stores/main'
1211
import NineLayout from './layouts/NineLayout.ce.vue'
1312
import StandardLayout from './layouts/StandardLayout.ce.vue'
1413
1514
const mainStore = useMainStore()
16-
const { hasWindowSize } = storeToRefs(mainStore)
1715
1816
const layout = computed(() => {
1917
if (mainStore.layout === 'standard') {
@@ -38,22 +36,4 @@ const layout = computed(() => {
3836
width: 100%;
3937
height: 100%;
4038
}
41-
42-
.polar-shadow {
43-
&::before {
44-
content: '';
45-
position: absolute;
46-
box-shadow:
47-
inset 0 1px 1px 0 rgba(53, 57, 86, 0.5),
48-
inset 0 1px 2px 0 rgba(53, 57, 86, 0.5),
49-
inset 0 1px 6px 0 rgba(110, 117, 151, 0.5);
50-
top: 0;
51-
right: 0;
52-
left: 0;
53-
bottom: 0;
54-
z-index: 1;
55-
border-radius: var(--kern-metric-border-radius-large);
56-
pointer-events: none;
57-
}
58-
}
5939
</style>

src/plugins/addressSearch/components/SearchResults.ce.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
tabindex="-1"
66
>
77
<template v-for="(result, i) in results" :key="result.categoryId">
8-
<h2
8+
<span
99
v-if="results.length > 1"
10+
:id="`polar-plugin-address-search-category-label-${result.categoryId}`"
1011
class="polar-plugin-address-search-category-label"
1112
>
1213
{{ result.categoryLabel }}
@@ -16,8 +17,9 @@
1617
ns: PluginId,
1718
})
1819
}}
19-
</h2>
20+
</span>
2021
<ul
22+
:aria-labelledby="`polar-plugin-address-search-category-label-${result.categoryId}`"
2123
:class="{
2224
'polar-plugin-address-search-list-without-label':
2325
results.length === 1,

src/plugins/footer/components/PolarFooter.ce.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@ const { leftEntries, rightEntries } = storeToRefs(useFooterStore())
3434
justify-content: space-between;
3535
align-items: center;
3636
flex-shrink: 0;
37+
z-index: -2;
3738
3839
background: var(--kern-color-layout-background-hued);
3940
box-shadow:
40-
0 1px 1px 0 rgba(53, 57, 86, 0.16),
41-
0 1px 2px 0 rgba(53, 57, 86, 0.25),
42-
0 1px 6px 0 rgba(110, 117, 151, 0.25);
41+
0 -1px 1px 0 rgba(53, 57, 86, 0.16),
42+
0 -1px 2px 0 rgba(53, 57, 86, 0.25),
43+
0 -1px 6px 0 rgba(110, 117, 151, 0.25);
4344
border-radius: 0 0 var(--kern-metric-border-radius-large)
4445
var(--kern-metric-border-radius-large);
4546

0 commit comments

Comments
 (0)