@swiftwc/ui 0.0.0-dev.113 → 0.0.0-dev.115
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/generated/client/index.js +1 -1
- package/generated/components/{body-view.d.ts → content-view.d.ts} +2 -2
- package/generated/components/{body-view.js → content-view.js} +3 -3
- package/generated/components/index.d.ts +1 -1
- package/generated/components/index.js +1 -1
- package/generated/components/picker-view.js +11 -11
- package/generated/css/index.css +122 -116
- package/generated/internal/class/navigation-path.js +2 -2
- package/generated/internal/privateNamespace.d.ts +1 -1
- package/generated/internal/privateNamespace.js +3 -3
- package/html-data/en.json +18 -10
- package/package.json +1 -1
- package/scss/_components.scss +1 -1
- package/scss/_maps.scss +2 -0
- package/scss/base/_layout.scss +7 -7
- package/scss/colors/_index.scss +1 -1
- package/scss/components/{_body-view.scss → _content-view.scss} +1 -1
- package/scss/components/_detail-placeholder.scss +4 -4
- package/scss/components/_form-view.scss +2 -2
- package/scss/components/_index.scss +1 -1
- package/scss/components/_list-view.scss +2 -2
- package/scss/components/_navigation-split-view.scss +16 -16
- package/scss/components/_scroll-view.scss +1 -1
- package/scss/components/_sheet-view.scss +1 -1
- package/scss/components/_tab-view.scss +13 -13
- package/scss/mixins/_index.scss +2 -2
- package/scss/transitions/_bwd.scss +2 -2
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Gets current host (closest)
|
|
3
3
|
*/
|
|
4
4
|
function closestHost(any) {
|
|
5
|
-
return any?.closest('
|
|
5
|
+
return any?.closest('content-view,[is=sheet-view],navigation-stack,navigation-split-view') ?? undefined;
|
|
6
6
|
}
|
|
7
7
|
export class NavigationPath {
|
|
8
8
|
#component;
|
|
@@ -49,7 +49,7 @@ export class NavigationPath {
|
|
|
49
49
|
}
|
|
50
50
|
#querySlot() {
|
|
51
51
|
this.#slot =
|
|
52
|
-
this.#component?.querySelector(':scope>
|
|
52
|
+
this.#component?.querySelector(':scope>content-view:not([hidden]),:scope>[is=sheet-view]:not([hidden]),:scope>navigation-stack:not([hidden]),:scope>navigation-split-view:not([hidden])') ?? null;
|
|
53
53
|
}
|
|
54
54
|
hydrate() {
|
|
55
55
|
this.#queryBody();
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type * as Components from '../components';
|
|
2
2
|
import { NavigationPath } from '../internal/class/navigation-path';
|
|
3
3
|
type TransitionType = 'forwards' | 'backwards' | 'reload';
|
|
4
|
-
export type NavigationHost = Components.
|
|
4
|
+
export type NavigationHost = Components.ContentView | Components.SheetView | Components.NavigationStack | Components.NavigationSplitView;
|
|
5
5
|
export type NavigationToolbarConfiguration = Components.ToolBarItem | Components.ToolBarItemGroup;
|
|
6
6
|
export type NavigationPage = Components.SidebarView | Components.ScrollView;
|
|
7
7
|
export declare function queryInsertPosition(frame?: NavigationHost): "afterend" | "beforebegin";
|
|
@@ -4,7 +4,7 @@ import { Snapshot } from '../snapshot';
|
|
|
4
4
|
export function queryInsertPosition(frame) {
|
|
5
5
|
if ('NAVIGATION-SPLIT-VIEW' === frame?.tagName)
|
|
6
6
|
return 'beforebegin'; // lookFor = 'previousElementSibling'
|
|
7
|
-
else if ('NAVIGATION-SPLIT-VIEW' === frame?.parentElement?.tagName && frame?.parentElement.querySelector(':scope>[is=sidebar-view]') && '
|
|
7
|
+
else if ('NAVIGATION-SPLIT-VIEW' === frame?.parentElement?.tagName && frame?.parentElement.querySelector(':scope>[is=sidebar-view]') && 'CONTENT-VIEW' === frame?.tagName)
|
|
8
8
|
return 'beforebegin'; // lookFor = 'previousElementSibling'
|
|
9
9
|
return 'afterend'; // lookFor = 'nextElementSibling'
|
|
10
10
|
}
|
|
@@ -71,8 +71,8 @@ export const startViewTransition = async (target, type = 'forwards', updateCallb
|
|
|
71
71
|
oldToolbar.classList.add('fwn'); // prepare navbs
|
|
72
72
|
// prepare new
|
|
73
73
|
const toolbarExclusion = 0 < modalViews.length
|
|
74
|
-
? (value, index, array) => value.parentElement?.matches('tool-bar:not(dialog tool-bar,
|
|
75
|
-
: (value, index, array) => value.parentElement?.matches('tool-bar:not(
|
|
74
|
+
? (value, index, array) => value.parentElement?.matches('tool-bar:not(dialog tool-bar,content-view ~ tool-bar)')
|
|
75
|
+
: (value, index, array) => value.parentElement?.matches('tool-bar:not(content-view ~ tool-bar)'), bodyExclusion = 0 < modalViews.length ? (item) => item.body?.matches('scroll-view:not(dialog scroll-view)') : (value, index, array) => value;
|
|
76
76
|
for (const bti of newToolbars?.filter?.(toolbarExclusion) ?? [])
|
|
77
77
|
bti.classList.add('fwnn'); // for (const ti of newToolbars ?? []) ti.classList.add('fwnn') //
|
|
78
78
|
for (const bt of tos?.filter?.(bodyExclusion) ?? []) {
|
package/html-data/en.json
CHANGED
|
@@ -11,16 +11,6 @@
|
|
|
11
11
|
],
|
|
12
12
|
"description": "A dialog that shows a message. Use it from the client module like `void alert('Save failed.')`.\n---\n\n```ts\ninterface AlertDialogSignature {}\n\nclass AlertDialog extends HTMLDialogElement<AlertDialogSignature> {}\n\ndeclare global {\n interface HTMLDialogElement {\n is: 'alert-dialog' // <dialog is=\"alert-dialog\"></dialog>\n }\n}\n\n```\n"
|
|
13
13
|
},
|
|
14
|
-
{
|
|
15
|
-
"name": "body-view",
|
|
16
|
-
"references": [
|
|
17
|
-
{
|
|
18
|
-
"name": "Documentation",
|
|
19
|
-
"url": "https://swiftwc.github.io/ui/web-components/body-view"
|
|
20
|
-
}
|
|
21
|
-
],
|
|
22
|
-
"description": "A container view that wraps a scroll view, marking it as a screen your app can navigate to.\n---\n\n```ts\ninterface BodyViewSignature {}\n\nclass BodyView extends HTMLElement<BodyViewSignature> {}\n\ndeclare global {\n interface HTMLElementTagNameMap {\n 'body-view': BodyView // <body-view></body-view>\n }\n}\n\n```\n"
|
|
23
|
-
},
|
|
24
14
|
{
|
|
25
15
|
"name": "bordered-button",
|
|
26
16
|
"references": [
|
|
@@ -141,6 +131,16 @@
|
|
|
141
131
|
],
|
|
142
132
|
"description": "A message with a title and extra information that you show when part of your app can’t be used.\n---\n\n```ts\ninterface ContentUnavailableSignature {\n Attributes: {\n search?: string\n }\n\n Slots: {\n default: HTMLElement[] // The default slot.\n description: HTMLElement[]\n actions: HTMLElement[]\n }\n}\n\nclass ContentUnavailable extends HTMLElement<ContentUnavailableSignature> {}\n\ndeclare global {\n interface HTMLElementTagNameMap {\n 'content-unavailable': ContentUnavailable // <content-unavailable></content-unavailable>\n }\n}\n\n```\n\n### **Examples:**\n**Example:**\n```html\n<content-unavailable search></content-unavailable>\n\n```\n**Example:**\n```html\n<content-unavailable search=\"foo\"></content-unavailable>\n\n```\n**Example:**\n```html\n<content-unavailable padding>\n <label-view title=\"No Mail\">\n <i class=\"ph ph-tray\" slot=\"icon\" foreground=\"secondary\"></i>\n </label-view>\n <label-view\n title=\"New mails you receive will appear here.\"\n foreground=\"secondary\"\n slot=\"description\"\n ></label-view>\n <button is=\"borderless-button\" type=\"button\" tabindex=\"0\" slot=\"actions\">\n <label-view title=\"Switch Account\"></label-view>\n </button>\n</content-unavailable>\n\n```\n**Example:**\n```html\n<content-unavailable padding>\n <label-view title=\"No Mail\">\n <svg slot=\"icon\" foreground=\"secondary\" ...>...</svg>\n </label-view>\n <label-view\n title=\"New mails you receive will appear here.\"\n foreground=\"secondary\"\n slot=\"description\"\n ></label-view>\n <button is=\"borderless-button\" type=\"button\" tabindex=\"0\" slot=\"actions\">\n <label-view title=\"Switch Account\"></label-view>\n </button>\n</content-unavailable>\n\n```\n"
|
|
143
133
|
},
|
|
134
|
+
{
|
|
135
|
+
"name": "content-view",
|
|
136
|
+
"references": [
|
|
137
|
+
{
|
|
138
|
+
"name": "Documentation",
|
|
139
|
+
"url": "https://swiftwc.github.io/ui/web-components/content-view"
|
|
140
|
+
}
|
|
141
|
+
],
|
|
142
|
+
"description": "A container view that wraps a scroll view, marking it as a screen your app can navigate to.\n---\n\n```ts\ninterface ContentViewSignature {}\n\nclass ContentView extends HTMLElement<ContentViewSignature> {}\n\ndeclare global {\n interface HTMLElementTagNameMap {\n 'content-view': ContentView // <content-view></content-view>\n }\n}\n\n```\n"
|
|
143
|
+
},
|
|
144
144
|
{
|
|
145
145
|
"name": "date-picker",
|
|
146
146
|
"references": [
|
|
@@ -1438,6 +1438,14 @@
|
|
|
1438
1438
|
{
|
|
1439
1439
|
"name": "Foreground",
|
|
1440
1440
|
"values": [
|
|
1441
|
+
{
|
|
1442
|
+
"name": "black",
|
|
1443
|
+
"description": "Applies the system black color (`--black`)"
|
|
1444
|
+
},
|
|
1445
|
+
{
|
|
1446
|
+
"name": "white",
|
|
1447
|
+
"description": "Applies the system white color (`--white`)"
|
|
1448
|
+
},
|
|
1441
1449
|
{
|
|
1442
1450
|
"name": "primary",
|
|
1443
1451
|
"description": "Applies the system primary color (`--primary`)"
|
package/package.json
CHANGED
package/scss/_components.scss
CHANGED
package/scss/_maps.scss
CHANGED
package/scss/base/_layout.scss
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
@use '../placeholders';
|
|
4
4
|
|
|
5
5
|
@layer #{vars.$components-layer} {
|
|
6
|
-
|
|
6
|
+
content-view,
|
|
7
7
|
navigation-stack,
|
|
8
8
|
navigation-split-view,
|
|
9
9
|
[is='full-screen'],
|
|
@@ -23,11 +23,11 @@
|
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
navigation-stack:has(> navigation-stack:not([hidden]),> navigation-split-view:not([hidden])),
|
|
26
|
-
navigation-stack:has(>
|
|
27
|
-
navigation-split-view:has(>
|
|
28
|
-
dialog:has(>
|
|
29
|
-
//
|
|
30
|
-
|
|
26
|
+
navigation-stack:has(> content-view),
|
|
27
|
+
navigation-split-view:has(> content-view),
|
|
28
|
+
dialog:has(> content-view),
|
|
29
|
+
// content-view:has(> dialog),
|
|
30
|
+
content-view:has(> content-view) {
|
|
31
31
|
> scroll-view,
|
|
32
32
|
> [is='sidebar-view'] > scroll-view {
|
|
33
33
|
:where(&) {
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
|
|
56
56
|
// NOTE: Going all the way back from deeply nested views forces an empty landing page.
|
|
57
57
|
// NOTE: Refactor this to add a content-visibility:visible when bwd/fwd classes are present.
|
|
58
|
-
// :is(navigation-stack, dialog,
|
|
58
|
+
// :is(navigation-stack, dialog, content-view):has(> content-view > content-view) {
|
|
59
59
|
// > scroll-view,
|
|
60
60
|
// > tool-bar {
|
|
61
61
|
// :where(&) {
|
package/scss/colors/_index.scss
CHANGED
|
@@ -105,7 +105,7 @@
|
|
|
105
105
|
@include mixins.if-2col-split-view-fits {
|
|
106
106
|
// also hide when in 2col mode with detail view
|
|
107
107
|
&:not(:has(> [is='sidebar-view'])) {
|
|
108
|
-
&:has(>
|
|
108
|
+
&:has(> content-view) {
|
|
109
109
|
detail-placeholder {
|
|
110
110
|
:where(&) {
|
|
111
111
|
--nav-split-view--detail-placeholder-visibility: collapse;
|
|
@@ -117,7 +117,7 @@
|
|
|
117
117
|
&:not([column-visibility='double-column']) {
|
|
118
118
|
// hide when no content view
|
|
119
119
|
&[preferred-compact-column='content'] {
|
|
120
|
-
&:not(:has(>
|
|
120
|
+
&:not(:has(> content-view)) {
|
|
121
121
|
detail-placeholder {
|
|
122
122
|
:where(&) {
|
|
123
123
|
--nav-split-view--detail-placeholder-visibility: collapse;
|
|
@@ -127,7 +127,7 @@
|
|
|
127
127
|
}
|
|
128
128
|
// also hide when in 3col mode with detail view
|
|
129
129
|
@include mixins.if-3col-split-view-fits {
|
|
130
|
-
&:has(>
|
|
130
|
+
&:has(> content-view > content-view) {
|
|
131
131
|
detail-placeholder {
|
|
132
132
|
:where(&) {
|
|
133
133
|
--nav-split-view--detail-placeholder-visibility: collapse;
|
|
@@ -139,7 +139,7 @@
|
|
|
139
139
|
|
|
140
140
|
// also hide when in 2col mode with detail view
|
|
141
141
|
&[column-visibility='double-column'] {
|
|
142
|
-
&:has(>
|
|
142
|
+
&:has(> content-view) {
|
|
143
143
|
detail-placeholder {
|
|
144
144
|
:where(&) {
|
|
145
145
|
--nav-split-view--detail-placeholder-visibility: collapse;
|
|
@@ -152,7 +152,7 @@ $form-elses: (
|
|
|
152
152
|
:where(navigation-split-view [is='sidebar-view'] &[form-style]) {
|
|
153
153
|
@include mixins.write-props(map.get($form-ifs, sidebar));
|
|
154
154
|
}
|
|
155
|
-
:where(navigation-split-view > scroll-view &[preferred-expanded-style], navigation-split-view >
|
|
155
|
+
:where(navigation-split-view > scroll-view &[preferred-expanded-style], navigation-split-view > content-view > scroll-view &[preferred-expanded-style]) {
|
|
156
156
|
@include mixins.write-props(map.get($form-ifs, inset));
|
|
157
157
|
}
|
|
158
158
|
}
|
|
@@ -167,7 +167,7 @@ $form-elses: (
|
|
|
167
167
|
:where(navigation-split-view:has(> [is='sidebar-view']) > [is='sidebar-view'] &[list-style]) {
|
|
168
168
|
--form-style: sidebar;
|
|
169
169
|
}
|
|
170
|
-
:where(navigation-split-view > scroll-view &[preferred-expanded-style], navigation-split-view >
|
|
170
|
+
:where(navigation-split-view > scroll-view &[preferred-expanded-style], navigation-split-view > content-view > scroll-view &[preferred-expanded-style]) {
|
|
171
171
|
--form-style: inset;
|
|
172
172
|
}
|
|
173
173
|
}
|
|
@@ -151,7 +151,7 @@ $list-elses: (
|
|
|
151
151
|
:where(navigation-split-view [is='sidebar-view'] &[list-style]) {
|
|
152
152
|
@include mixins.write-props(map.get($list-ifs, sidebar));
|
|
153
153
|
}
|
|
154
|
-
:where(navigation-split-view > scroll-view &[preferred-expanded-style], navigation-split-view >
|
|
154
|
+
:where(navigation-split-view > scroll-view &[preferred-expanded-style], navigation-split-view > content-view > scroll-view &[preferred-expanded-style]) {
|
|
155
155
|
@include mixins.write-props(map.get($list-ifs, inset));
|
|
156
156
|
}
|
|
157
157
|
}
|
|
@@ -166,7 +166,7 @@ $list-elses: (
|
|
|
166
166
|
:where(navigation-split-view:has(> [is='sidebar-view']) > [is='sidebar-view'] &[list-style]) {
|
|
167
167
|
--list-style: sidebar;
|
|
168
168
|
}
|
|
169
|
-
:where(navigation-split-view > scroll-view &[preferred-expanded-style], navigation-split-view >
|
|
169
|
+
:where(navigation-split-view > scroll-view &[preferred-expanded-style], navigation-split-view > content-view > scroll-view &[preferred-expanded-style]) {
|
|
170
170
|
--list-style: inset;
|
|
171
171
|
}
|
|
172
172
|
}
|
|
@@ -49,16 +49,16 @@
|
|
|
49
49
|
z-index: -1;
|
|
50
50
|
}
|
|
51
51
|
|
|
52
|
-
:where(& >
|
|
52
|
+
:where(& > content-view ~ scroll-view, & > content-view ~ [is='sidebar-view']) {
|
|
53
53
|
z-index: -1;
|
|
54
54
|
}
|
|
55
55
|
|
|
56
56
|
&:has(> [is='sidebar-view']) {
|
|
57
|
-
:where(& >
|
|
57
|
+
:where(& > content-view ~ [is='sidebar-view']) {
|
|
58
58
|
z-index: -2;
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
-
:where(& >
|
|
61
|
+
:where(& > content-view > content-view ~ scroll-view) {
|
|
62
62
|
z-index: -1;
|
|
63
63
|
}
|
|
64
64
|
}
|
|
@@ -67,12 +67,12 @@
|
|
|
67
67
|
&:has(> [is='sidebar-view']) {
|
|
68
68
|
@include mixins.ifnot-3col-split-view-fits {
|
|
69
69
|
&:not([preferred-compact-column='content']) {
|
|
70
|
-
:where(& >
|
|
70
|
+
:where(& > content-view > content-view ~ scroll-view) {
|
|
71
71
|
z-index: -1;
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
|
|
75
|
-
//
|
|
75
|
+
// content-view > content-view {
|
|
76
76
|
// clip-path: inset(
|
|
77
77
|
// 0 0 0 var(--nav-split-view-content-inline-size)
|
|
78
78
|
// ); // force clipping because it is now a floating element unable to hide bg = overflow: clip;
|
|
@@ -82,7 +82,7 @@
|
|
|
82
82
|
|
|
83
83
|
@include mixins.if-2col-split-view-fits {
|
|
84
84
|
&[column-visibility='double-column'] {
|
|
85
|
-
:where(& >
|
|
85
|
+
:where(& > content-view > content-view ~ scroll-view) {
|
|
86
86
|
z-index: -1;
|
|
87
87
|
}
|
|
88
88
|
}
|
|
@@ -143,7 +143,7 @@
|
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
|
|
146
|
-
>
|
|
146
|
+
> content-view {
|
|
147
147
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
148
148
|
&,
|
|
149
149
|
& ~ tool-bar {
|
|
@@ -215,7 +215,7 @@
|
|
|
215
215
|
// }
|
|
216
216
|
}
|
|
217
217
|
|
|
218
|
-
>
|
|
218
|
+
> content-view {
|
|
219
219
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
220
220
|
&,
|
|
221
221
|
& ~ tool-bar {
|
|
@@ -250,7 +250,7 @@
|
|
|
250
250
|
}
|
|
251
251
|
|
|
252
252
|
// move descendants to left edge of screen
|
|
253
|
-
>
|
|
253
|
+
> content-view {
|
|
254
254
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
255
255
|
&,
|
|
256
256
|
& ~ tool-bar {
|
|
@@ -309,7 +309,7 @@
|
|
|
309
309
|
// &:has(> dialog[is='sidebar-view']) {
|
|
310
310
|
// &:not([column-visibility='double-column']) {
|
|
311
311
|
// container of content col (principal)
|
|
312
|
-
>
|
|
312
|
+
> content-view {
|
|
313
313
|
// cancel animations
|
|
314
314
|
> scroll-view {
|
|
315
315
|
~ tool-bar {
|
|
@@ -343,7 +343,7 @@
|
|
|
343
343
|
}
|
|
344
344
|
|
|
345
345
|
// container of details col (trailing)
|
|
346
|
-
>
|
|
346
|
+
> content-view {
|
|
347
347
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
348
348
|
&,
|
|
349
349
|
& ~ tool-bar {
|
|
@@ -377,7 +377,7 @@
|
|
|
377
377
|
--scroll-view-translate: translateX(var(--view-transition-principal-x)); //!important
|
|
378
378
|
}
|
|
379
379
|
|
|
380
|
-
>
|
|
380
|
+
> content-view {
|
|
381
381
|
@include force-disable-col-view-transitions;
|
|
382
382
|
}
|
|
383
383
|
|
|
@@ -389,12 +389,12 @@
|
|
|
389
389
|
@include mixins.ifnot-3col-split-view-fits {
|
|
390
390
|
&[preferred-compact-column='content'] {
|
|
391
391
|
// move descendants to right
|
|
392
|
-
>
|
|
392
|
+
> content-view {
|
|
393
393
|
> scroll-view {
|
|
394
394
|
--scroll-view-translate: translateX(var(--view-transition-principal-x)); //!important;
|
|
395
395
|
}
|
|
396
396
|
|
|
397
|
-
>
|
|
397
|
+
> content-view {
|
|
398
398
|
@include force-disable-col-view-transitions;
|
|
399
399
|
}
|
|
400
400
|
}
|
|
@@ -406,13 +406,13 @@
|
|
|
406
406
|
// SIDEBAR | COMPACT | EXPANDED
|
|
407
407
|
@include mixins.if-3col-split-view-fits {
|
|
408
408
|
// container of compact col (middle)
|
|
409
|
-
>
|
|
409
|
+
> content-view {
|
|
410
410
|
// Fix position as compact col in the middle
|
|
411
411
|
> scroll-view {
|
|
412
412
|
--scroll-view-translate: translateX(var(--view-transition-principal-x)); // !important;
|
|
413
413
|
}
|
|
414
414
|
|
|
415
|
-
>
|
|
415
|
+
> content-view {
|
|
416
416
|
@include force-disable-col-view-transitions;
|
|
417
417
|
}
|
|
418
418
|
}
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
19
19
|
#{$selector} navigation-stack > &,
|
|
20
20
|
#{$selector} navigation-split-view > &,
|
|
21
|
-
#{$selector}
|
|
21
|
+
#{$selector} content-view > & {
|
|
22
22
|
&,
|
|
23
23
|
& ~ tool-bar {
|
|
24
24
|
:where(&) {
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
scroll-view:not(:has(~ tool-bar > [slot^='bottom-bar'])):not(:has(> [slot^='bottom-bar'])) {
|
|
42
42
|
:where(#{$selector} navigation-stack > &),
|
|
43
43
|
:where(#{$selector} navigation-split-view > &),
|
|
44
|
-
:where(#{$selector}
|
|
44
|
+
:where(#{$selector} content-view > &) {
|
|
45
45
|
--safe-area-inset-bottom: calc(max(env(safe-area-inset-bottom), var(--sidebar-block-spacing)) + var(--iphone-tabbar-block-size));
|
|
46
46
|
}
|
|
47
47
|
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
65
65
|
#{$selector} navigation-stack > &,
|
|
66
66
|
#{$selector} navigation-split-view > &,
|
|
67
|
-
#{$selector}
|
|
67
|
+
#{$selector} content-view > & {
|
|
68
68
|
&,
|
|
69
69
|
& ~ tool-bar {
|
|
70
70
|
:where(&) {
|
|
@@ -146,7 +146,7 @@
|
|
|
146
146
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
147
147
|
tab-view:not([tab-view-style='tab-bar-only']) navigation-stack > &,
|
|
148
148
|
tab-view:not([tab-view-style='tab-bar-only']) navigation-split-view > &,
|
|
149
|
-
tab-view:not([tab-view-style='tab-bar-only'])
|
|
149
|
+
tab-view:not([tab-view-style='tab-bar-only']) content-view > & {
|
|
150
150
|
&,
|
|
151
151
|
& ~ tool-bar {
|
|
152
152
|
:where(&) {
|
|
@@ -213,7 +213,7 @@
|
|
|
213
213
|
// DISCARDS
|
|
214
214
|
@include mixins.if-2col-split-view-fits {
|
|
215
215
|
&:not(:has(> [is='sidebar-view'])) {
|
|
216
|
-
>
|
|
216
|
+
> content-view {
|
|
217
217
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
218
218
|
@include mixins.discard-sidebar-measures;
|
|
219
219
|
}
|
|
@@ -222,7 +222,7 @@
|
|
|
222
222
|
&:has(> [is='sidebar-view']) {
|
|
223
223
|
&:not([column-visibility='double-column']) {
|
|
224
224
|
&:not([preferred-compact-column='content']) {
|
|
225
|
-
>
|
|
225
|
+
> content-view {
|
|
226
226
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
227
227
|
@include mixins.discard-sidebar-measures;
|
|
228
228
|
}
|
|
@@ -230,8 +230,8 @@
|
|
|
230
230
|
}
|
|
231
231
|
&[preferred-compact-column='content'] {
|
|
232
232
|
@include mixins.ifnot-3col-split-view-fits {
|
|
233
|
-
>
|
|
234
|
-
>
|
|
233
|
+
> content-view {
|
|
234
|
+
> content-view {
|
|
235
235
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
236
236
|
@include mixins.discard-sidebar-measures;
|
|
237
237
|
}
|
|
@@ -240,7 +240,7 @@
|
|
|
240
240
|
}
|
|
241
241
|
}
|
|
242
242
|
@include mixins.if-3col-split-view-fits {
|
|
243
|
-
>
|
|
243
|
+
> content-view {
|
|
244
244
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
245
245
|
@include mixins.discard-sidebar-measures;
|
|
246
246
|
}
|
|
@@ -248,7 +248,7 @@
|
|
|
248
248
|
}
|
|
249
249
|
}
|
|
250
250
|
&[column-visibility='double-column'] {
|
|
251
|
-
>
|
|
251
|
+
> content-view {
|
|
252
252
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
253
253
|
@include mixins.discard-sidebar-measures;
|
|
254
254
|
}
|
|
@@ -272,7 +272,7 @@
|
|
|
272
272
|
&:not(:has(> [is='sidebar-view'])) {
|
|
273
273
|
--nav-split-view--content-inline-size: calc(var(--nav-split-view-content-inline-size) + var(--sidebar-inline-size, 0px));
|
|
274
274
|
|
|
275
|
-
>
|
|
275
|
+
> content-view {
|
|
276
276
|
--sidebar-inline-size: 0px;
|
|
277
277
|
--sidebar-inline-spacing: 0px;
|
|
278
278
|
}
|
|
@@ -282,7 +282,7 @@
|
|
|
282
282
|
scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
283
283
|
tab-view:not([tab-view-style='tab-bar-only']) navigation-stack > &,
|
|
284
284
|
tab-view:not([tab-view-style='tab-bar-only']) navigation-split-view > &,
|
|
285
|
-
tab-view:not([tab-view-style='tab-bar-only'])
|
|
285
|
+
tab-view:not([tab-view-style='tab-bar-only']) content-view > & {
|
|
286
286
|
&,
|
|
287
287
|
& ~ tool-bar {
|
|
288
288
|
:where(&) {
|
|
@@ -297,7 +297,7 @@
|
|
|
297
297
|
// --nav-split-view--content-inline-size: calc(var(--nav-split-view-content-inline-size) + var(--sidebar-inline-size, 0px));
|
|
298
298
|
// }
|
|
299
299
|
// scroll-view:not(dialog scroll-view):not(scroll-view scroll-view) {
|
|
300
|
-
// tab-view:not([tab-view-style='tab-bar-only']) navigation-split-view:not(:has(> [is='sidebar-view'])) >
|
|
300
|
+
// tab-view:not([tab-view-style='tab-bar-only']) navigation-split-view:not(:has(> [is='sidebar-view'])) > content-view & {
|
|
301
301
|
// &,
|
|
302
302
|
// & ~ tool-bar {
|
|
303
303
|
// :where(&) {
|
package/scss/mixins/_index.scss
CHANGED
|
@@ -325,13 +325,13 @@
|
|
|
325
325
|
@content;
|
|
326
326
|
}
|
|
327
327
|
// is content-view!
|
|
328
|
-
navigation-split-view:has(> [is='sidebar-view'])[preferred-compact-column='content']:not([column-visibility='double-column']) >
|
|
328
|
+
navigation-split-view:has(> [is='sidebar-view'])[preferred-compact-column='content']:not([column-visibility='double-column']) > content-view > scroll-view & {
|
|
329
329
|
@content;
|
|
330
330
|
}
|
|
331
331
|
}
|
|
332
332
|
// is content-view!
|
|
333
333
|
@include if-3col-split-view-fits {
|
|
334
|
-
navigation-split-view:has(> [is='sidebar-view']):not([column-visibility='double-column']) >
|
|
334
|
+
navigation-split-view:has(> [is='sidebar-view']):not([column-visibility='double-column']) > content-view > scroll-view & {
|
|
335
335
|
@content;
|
|
336
336
|
}
|
|
337
337
|
}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
|
|
14
14
|
// Inert nested landmarks of destination so that destination can be interacted with
|
|
15
15
|
// Make sure old/outgoing elements can NOT be interacted with (new elements are stacked lower)
|
|
16
|
-
~
|
|
16
|
+
~ content-view,
|
|
17
17
|
~ navigation-stack,
|
|
18
18
|
~ navigation-split-view {
|
|
19
19
|
pointer-events: none;
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
// navigation-split-view > .bwdd {
|
|
33
33
|
// z-index: 0;
|
|
34
34
|
// }
|
|
35
|
-
navigation-split-view >
|
|
35
|
+
navigation-split-view > content-view:has(~ .bwdd) {
|
|
36
36
|
pointer-events: none;
|
|
37
37
|
// z-index: 1;
|
|
38
38
|
}
|