Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 75 additions & 0 deletions demo/e2e/rtl.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import { expect, test } from '@playwright/test';

for (const direction of ['ltr', 'rtl'] as const) {
test(`${direction} mirrors logical spacing with asymmetric safe areas`, async ({ page }) => {
await page.goto('/main/index', { waitUntil: 'networkidle' });
await page.evaluate((dir) => {
const fixture = document.createElement('div');
fixture.id = 'rtl-probe';
fixture.dir = dir;
fixture.style.cssText =
'position:fixed;inset:0;z-index:99999;--ion-safe-area-left:20px;--ion-safe-area-right:8px;--ios-theme-menu-width:0px';

const fab = document.createElement('ion-fab');
fab.id = 'fab-probe';
fab.mode = 'ios';
fab.className = 'fab-horizontal-start';
fab.innerHTML = '<ion-fab-button>+</ion-fab-button>';

const tabs = document.createElement('ion-tab-bar');
tabs.id = 'tabs-probe';
tabs.mode = 'ios';
tabs.slot = 'bottom';
tabs.className = 'tab-bar-position-start';
tabs.innerHTML = '<ion-tab-button>One</ion-tab-button><ion-tab-button>Two</ion-tab-button>';

const list = document.createElement('ion-list');
list.id = 'list-probe';
list.mode = 'ios';
list.className = 'list-inset';
list.innerHTML =
'<ion-radio-group><div class="radio-group-top">Supporting text</div><ion-item>Item</ion-item></ion-radio-group><ion-note>Footer</ion-note>';

const toolbar = document.createElement('ion-toolbar');
toolbar.id = 'toolbar-probe';
toolbar.mode = 'ios';
toolbar.className = 'toolbar-searchbar';
toolbar.innerHTML = '<ion-buttons slot="start"><ion-button>Action</ion-button></ion-buttons><ion-searchbar></ion-searchbar>';

fixture.append(fab, tabs, list, toolbar);
document.body.append(fixture);
}, direction);

await expect(page.locator('#fab-probe')).toHaveClass(/hydrated/);
await expect(page.locator('#tabs-probe')).toHaveClass(/hydrated/);
await expect(page.locator('#list-probe')).toHaveClass(/hydrated/);

const values = await page.locator('#rtl-probe').evaluate((fixture) => {
const direction = fixture.getAttribute('dir');
const style = (selector: string) => getComputedStyle(fixture.querySelector(selector)!);
const fab = fixture.querySelector('#fab-probe')!.getBoundingClientRect();
const tabs = fixture.querySelector('#tabs-probe')!.getBoundingClientRect();
const note = style('#list-probe > ion-note');
const radio = style('.radio-group-top');
const toolbarButtons = style('#toolbar-probe ion-buttons');

return {
fabStart: direction === 'ltr' ? fab.left : innerWidth - fab.right,
tabsStart: direction === 'ltr' ? tabs.left : innerWidth - tabs.right,
noteStart: note.marginInlineStart,
noteEnd: note.marginInlineEnd,
radioStart: radio.paddingInlineStart,
radioEnd: radio.paddingInlineEnd,
toolbarGap: toolbarButtons.marginInlineEnd,
};
});

expect(values.fabStart).toBeCloseTo(16, 1);
expect(values.tabsStart).toBeCloseTo(direction === 'ltr' ? 36 : 24, 1);
expect(values.noteStart).toBe(direction === 'ltr' ? '40px' : '28px');
expect(values.noteEnd).toBe(direction === 'ltr' ? '28px' : '40px');
expect(values.radioStart).toBe(direction === 'ltr' ? '40px' : '28px');
expect(values.radioEnd).toBe(direction === 'ltr' ? '28px' : '40px');
expect(values.toolbarGap).toBe('6px');
});
}
2 changes: 1 addition & 1 deletion demo/src/app/album/album-page.component.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ion-header {
position: absolute;
top: 0;
left: 0;
inset-inline-start: 0;
}

ion-content {
Expand Down
2 changes: 1 addition & 1 deletion demo/src/app/index/pages/button/button.page.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ion-item *[slot='end'] {
margin-right: 6px;
margin-inline-end: 6px;
}
7 changes: 5 additions & 2 deletions demo/src/app/index/pages/tabs/tabs.page.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
:host {
ion-tab-bar {
margin-left: calc(16px + var(--ion-safe-area-left, 0px));
margin-right: calc(16px + var(--ion-safe-area-right, 0px));
margin-inline: calc(16px + var(--ion-safe-area-left, 0px)) calc(16px + var(--ion-safe-area-right, 0px));

&:dir(rtl) {
margin-inline: calc(16px + var(--ion-safe-area-right, 0px)) calc(16px + var(--ion-safe-area-left, 0px));
}
}
}
4 changes: 2 additions & 2 deletions demo/src/app/settings/settings-page.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ion-item > ion-icon[slot='start'] {
ion-item > ion-icon[slot='start'] {
padding: 4px;
font-size: 1.3rem;
margin-right: 14px;
margin-inline-end: 14px;
border-radius: 8px;
}
}
Expand All @@ -24,7 +24,7 @@ ion-item > ion-icon[slot='start'] {
padding: 8px;
width: calc(40px - 16px);
height: calc(40px - 16px);
margin-right: 16px;
margin-inline-end: 16px;
border-radius: 50%;
background: var(--ion-color-light-shade);
}
Expand Down
5 changes: 2 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"homepage": "https://docs.rdlabo.dev/projects/ionic-theme-ios26",
"dependencies": {
"@rdlabo/ionic-theme-utils": "git+ssh://git@github.com/rdlabo-dev/ionic-theme-utils.git#1937b175b2498d2f272ae697190300e94f367213"
"@rdlabo/ionic-theme-utils": "git+ssh://git@github.com/rdlabo-dev/ionic-theme-utils.git#66eb2fccca10646ebfccdfb3b6c2f3b4c9b00bf6"
},
"devDependencies": {
"@ionic/angular": "^9.0.0",
Expand Down
7 changes: 4 additions & 3 deletions src/styles/components/ion-button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -459,12 +459,13 @@ ion-buttons.ios:not(.ios-theme-disabled, .ios26-disabled):not(

ion-buttons.ios:not(.ios-theme-disabled, .ios26-disabled):not(:has(ion-back-button, ion-button.button-clear)) {
ion-button {
margin: 0 6px;
margin-block: 0;
margin-inline: 6px;
&:first-child {
margin-left: 0;
margin-inline-start: 0;
}
&:last-child {
margin-right: 0;
margin-inline-end: 0;
}
&:only-child {
margin: 0;
Expand Down
14 changes: 10 additions & 4 deletions src/styles/components/ion-fab.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@ $scaleup-default-icon-only: 1.2;
$scaleup-large-icon-only: 1.12;

ion-fab.ios:not(.ios-theme-disabled, .ios26-disabled) {
--ios-theme-safe-area-inline-start: var(--ion-safe-area-left, 0px);
--ios-theme-safe-area-inline-end: var(--ion-safe-area-right, 0px);
--transform-value: 3px;
&:dir(rtl) {
--ios-theme-safe-area-inline-start: var(--ion-safe-area-right, 0px);
--ios-theme-safe-area-inline-end: var(--ion-safe-area-left, 0px);
}
&:has(> ion-fab-button.fab-button-small) {
--transform-value: 4px;
}
Expand Down Expand Up @@ -92,20 +98,20 @@ ion-fab.ios:not(.ios-theme-disabled, .ios26-disabled) {
}

&.fab-horizontal-start {
left: calc(16px + var(--ios-theme-menu-width, var(--ios26-menu-width, var(--ion-safe-area-left), 0px)));
inset-inline-start: calc(16px + var(--ios-theme-menu-width, var(--ios26-menu-width, var(--ios-theme-safe-area-inline-start))));
}

&.fab-horizontal-end {
right: calc(16px + var(--ion-safe-area-right, 0px));
inset-inline-end: calc(16px + var(--ios-theme-safe-area-inline-end));
}

&:has(.fab-button-small) {
&.fab-horizontal-start {
left: calc(10px + var(--ios-theme-menu-width, var(--ios26-menu-width, var(--ion-safe-area-left), 0px)));
inset-inline-start: calc(10px + var(--ios-theme-menu-width, var(--ios26-menu-width, var(--ios-theme-safe-area-inline-start))));
}

&.fab-horizontal-end {
right: calc(10px + var(--ion-safe-area-right, 0px));
inset-inline-end: calc(10px + var(--ios-theme-safe-area-inline-end));
}
}
}
9 changes: 9 additions & 0 deletions src/styles/components/ion-list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ ion-list.list-inset.ios:not(.ios-theme-disabled, .ios26-disabled) {
@include structured-list.layout(20px, 28px, $disabled-selector: $ios26-disabled);
margin-inline: calc(20px + var(--ion-safe-area-left, 0px)) calc(20px + var(--ion-safe-area-right, 0px));

&:dir(rtl) {
margin-inline: calc(20px + var(--ion-safe-area-right, 0px)) calc(20px + var(--ion-safe-area-left, 0px));
}

ion-radio-group,
ion-reorder-group {
display: block;
Expand All @@ -25,6 +29,11 @@ ion-list.list-inset.ios:not(.ios-theme-disabled, .ios26-disabled) {
padding-inline-end: calc(var(--ion-safe-area-right, 0) + 20px);
}

&:dir(rtl) ion-radio-group > .radio-group-top {
padding-inline-start: calc(var(--ion-safe-area-right, 0) + 20px);
padding-inline-end: calc(var(--ion-safe-area-left, 0) + 20px);
}

> :is(#{structured-list.$groups}):not(.ios-theme-disabled, .ios26-disabled) {
ion-item:not(.ios-theme-disabled, .ios26-disabled) {
// To draw lines inside
Expand Down
27 changes: 17 additions & 10 deletions src/styles/components/ion-menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ ion-split-pane.ios:not(.ios-theme-disabled, .ios26-disabled).split-pane-visible:
.split-pane-main {
ion-tab-bar.ios:not(.ios-theme-disabled, .ios26-disabled) {
width: calc(
100% - calc(18px + var(--ion-safe-area-left, 0px)) - calc(18px + var(--ion-safe-area-left, 0px)) - 60px -
100% - calc(18px + var(--ion-safe-area-left, 0px)) - calc(18px + var(--ion-safe-area-right, 0px)) - 60px -
12px - var(--ios-theme-menu-width, var(--ios26-menu-width))
);

&:has(:nth-child(5)) {
width: calc(
100% - calc(18px + var(--ion-safe-area-left, 0px)) - calc(18px + var(--ion-safe-area-left, 0px)) - var(
100% - calc(18px + var(--ion-safe-area-left, 0px)) - calc(18px + var(--ion-safe-area-right, 0px)) - var(
--ios-theme-menu-width,
var(--ios26-menu-width)
)
Expand All @@ -33,7 +33,7 @@ ion-split-pane.ios:not(.ios-theme-disabled, .ios26-disabled).split-pane-visible:
/*
* 90px: https://github.com/ionic-team/ionic-framework/blob/main/core/src/components/title/title.ios.scss#L8
*/
padding-left: calc(90px + var(--ios-theme-menu-width, var(--ios26-menu-width)));
padding-inline-start: calc(90px + var(--ios-theme-menu-width, var(--ios26-menu-width)));
}
}
ion-content {
Expand All @@ -47,7 +47,10 @@ ion-split-pane.ios:not(.ios-theme-disabled, .ios26-disabled).split-pane-visible:
}
ion-tab-bar.ios:not(.ios-theme-disabled, .ios26-disabled) {
&[slot='bottom'] {
left: calc(16px + var(--ion-safe-area-left, 0px) + var(--ios-theme-menu-width, var(--ios26-menu-width)));
inset-inline-start: calc(16px + var(--ion-safe-area-left, 0px) + var(--ios-theme-menu-width, var(--ios26-menu-width)));
&:dir(rtl) {
inset-inline-start: calc(16px + var(--ion-safe-area-right, 0px) + var(--ios-theme-menu-width, var(--ios26-menu-width)));
}
}
}
}
Expand All @@ -64,7 +67,7 @@ ion-split-pane.ios:not(.ios-theme-disabled, .ios26-disabled).split-pane-visible:
/*
* 90px: https://github.com/ionic-team/ionic-framework/blob/main/core/src/components/title/title.ios.scss#L8
*/
padding-right: calc(90px + var(--ios-theme-menu-width, var(--ios26-menu-width)));
padding-inline-end: calc(90px + var(--ios-theme-menu-width, var(--ios26-menu-width)));
}
}
ion-content {
Expand All @@ -89,10 +92,10 @@ ion-menu.ios:not(.ios-theme-disabled, .ios26-disabled) {
z-index: 999;

&.menu-side-start {
left: 0;
inset-inline-start: 0;
}
&.menu-side-end {
left: calc(100vw - var(--ios-theme-menu-width, var(--ios26-menu-width)));
inset-inline-end: 0;
}

&::part(backdrop) {
Expand All @@ -106,10 +109,14 @@ ion-menu.ios:not(.ios-theme-disabled, .ios26-disabled) {

&::part(scroll) {
@include api.glass-background;
margin: calc(var(--ios-theme-floating-safe-area-top, var(--ios26-floating-safe-area-top)) + 6px)
calc(16px + var(--ion-safe-area-right)) var(--ios-theme-floating-safe-area-bottom, var(--ios26-floating-safe-area-bottom))
calc(12px + var(--ion-safe-area-left));
margin-block: calc(var(--ios-theme-floating-safe-area-top, var(--ios26-floating-safe-area-top)) + 6px)
var(--ios-theme-floating-safe-area-bottom, var(--ios26-floating-safe-area-bottom));
margin-inline: calc(12px + var(--ion-safe-area-left, 0px)) calc(16px + var(--ion-safe-area-right, 0px));
border-radius: 24px;
}

&:dir(rtl)::part(scroll) {
margin-inline: calc(12px + var(--ion-safe-area-right, 0px)) calc(16px + var(--ion-safe-area-left, 0px));
}
}
}
2 changes: 1 addition & 1 deletion src/styles/components/ion-searchbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@ ion-searchbar.ios:not(.ios-theme-disabled, .ios26-disabled).searchbar-classic {
width: 1.18rem;
}
button.searchbar-clear-button {
right: 8px;
inset-inline-end: 8px;
}
}
10 changes: 8 additions & 2 deletions src/styles/components/ion-tabs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
}

ion-tab-bar.ios:not(.ios-theme-disabled, .ios26-disabled) {
--ios-theme-safe-area-inline-start: var(--ion-safe-area-left, 0px);
--ios-theme-safe-area-inline-end: var(--ion-safe-area-right, 0px);
&:dir(rtl) {
--ios-theme-safe-area-inline-start: var(--ion-safe-area-right, 0px);
--ios-theme-safe-area-inline-end: var(--ion-safe-area-left, 0px);
}
// UIKit's platter is 62pt, including its 4pt selection inset. Put the
// physical-pixel rim on a separate surface so it cannot alter layout.
border: 0;
Expand All @@ -35,13 +41,13 @@ ion-tab-bar.ios:not(.ios-theme-disabled, .ios26-disabled) {
&[slot='top'] {
position: absolute;
top: var(--ios-theme-floating-safe-area-top, var(--ios26-floating-safe-area-top));
right: calc(16px + var(--ion-safe-area-right, 0px));
inset-inline-end: calc(16px + var(--ios-theme-safe-area-inline-end));
}

&[slot='bottom'] {
position: absolute;
bottom: var(--ios-theme-floating-safe-area-bottom, var(--ios26-floating-safe-area-bottom));
left: calc(16px + var(--ion-safe-area-left, 0px));
inset-inline-start: calc(16px + var(--ios-theme-safe-area-inline-start));
}

/**
Expand Down
19 changes: 9 additions & 10 deletions src/styles/components/ion-toolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -58,37 +58,36 @@ ion-toolbar.ios:not(.ios-theme-disabled, .ios26-disabled).toolbar-searchbar {
}
&:has(ion-buttons[slot='start']) {
ion-buttons[slot='start'] {
margin-right: 6px;
margin-inline-end: 6px;
}
ion-searchbar.ios:not(.ios-theme-disabled, .ios26-disabled) {
.searchbar-input-container {
margin: 0 12px 0 6px;
margin-block: 0;
margin-inline: 6px 12px;
}
}
}
&:has(ion-buttons[slot='end']) {
ion-buttons[slot='end'] {
margin-left: 6px;
margin-inline-start: 6px;
}
ion-searchbar.ios:not(.ios-theme-disabled, .ios26-disabled) {
.searchbar-input-container {
margin: 0 6px 0 12px;
margin-block: 0;
margin-inline: 12px 6px;
}
}
}
}

ion-toolbar.ios:not(.ios-theme-disabled, .ios26-disabled) {
ion-buttons {
margin-left: 12px;
margin-right: 12px;
margin-inline: 12px;
}
ion-back-button {
margin-left: 12px;
margin-right: 12px;
margin-inline: 12px;
}
ion-buttons > ion-back-button {
margin-left: 0;
margin-right: 0;
margin-inline: 0;
}
}
Loading