Skip to content

Commit 6d04e6f

Browse files
authored
Merge branch 'next' into ROU-11445-select
2 parents 889f85b + 8f6f8b4 commit 6d04e6f

File tree

8 files changed

+6810
-17
lines changed

8 files changed

+6810
-17
lines changed

core/package-lock.json

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

core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"fs-extra": "^9.0.1",
6767
"jest": "^29.7.0",
6868
"jest-cli": "^29.7.0",
69-
"outsystems-design-tokens": "^1.0.1",
69+
"outsystems-design-tokens": "^1.1.2",
7070
"prettier": "^2.8.8",
7171
"rollup": "^2.26.4",
7272
"sass": "^1.33.0",

core/src/components/segment-button/segment-button.ionic.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,13 @@
7979
color: var(--color-disabled);
8080
}
8181

82+
// Segment Button: Focused
83+
// --------------------------------------------------
84+
85+
:host(.ion-focused) .button-inner {
86+
@include globals.focused-state();
87+
}
88+
8289
// Segment Button: Indicator
8390
// --------------------------------------------------
8491

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import { expect } from '@playwright/test';
2+
import { configs, test } from '@utils/test/playwright';
3+
4+
configs({ modes: ['ionic-md'], directions: ['ltr'] }).forEach(({ title, screenshot, config }) => {
5+
test.describe(title('segment: states'), () => {
6+
test('should render focused segment correctly', async ({ page }) => {
7+
await page.setContent(
8+
`
9+
<ion-segment value="2">
10+
<ion-segment-button value="1">
11+
<ion-label>Bookmarks</ion-label>
12+
</ion-segment-button>
13+
<ion-segment-button class="ion-focused" value="2">
14+
<ion-label>Reading List</ion-label>
15+
</ion-segment-button>
16+
<ion-segment-button value="3">
17+
<ion-label>Shared Links</ion-label>
18+
</ion-segment-button>
19+
</ion-segment>
20+
`,
21+
config
22+
);
23+
24+
const segment = page.locator('ion-segment');
25+
26+
await expect(segment).toHaveScreenshot(screenshot(`segment-focused`));
27+
});
28+
});
29+
});
4.39 KB
Loading
5.04 KB
Loading
3.85 KB
Loading

core/src/foundations/ionic.vars.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@ $ion-bg-warning-subtle-press: var(--ion-bg-warning-subtle-press, #ffcfb1);
175175
$ion-bg-warning-subtle-press-rgb: var(--ion-bg-warning-subtle-press-rgb, 255, 207, 177);
176176
$ion-bg-body: var(--ion-bg-body, #f5f5f5);
177177
$ion-bg-body-rgb: var(--ion-bg-body-rgb, 245, 245, 245);
178-
$ion-bg-neutral-subtle-default: var(--ion-bg-neutral-subtle-default, #f5f5f5);
179-
$ion-bg-neutral-subtle-default-rgb: var(--ion-bg-neutral-subtle-default-rgb, 245, 245, 245);
180-
$ion-bg-neutral-subtle-press: var(--ion-bg-neutral-subtle-press, #cfcfcf);
181-
$ion-bg-neutral-subtle-press-rgb: var(--ion-bg-neutral-subtle-press-rgb, 207, 207, 207);
178+
$ion-bg-neutral-subtle-default: var(--ion-bg-neutral-subtle-default, #e7e7e7);
179+
$ion-bg-neutral-subtle-default-rgb: var(--ion-bg-neutral-subtle-default-rgb, 231, 231, 231);
180+
$ion-bg-neutral-subtle-press: var(--ion-bg-neutral-subtle-press, #b9b9b9);
181+
$ion-bg-neutral-subtle-press-rgb: var(--ion-bg-neutral-subtle-press-rgb, 185, 185, 185);
182182
$ion-bg-neutral-base-default: var(--ion-bg-neutral-base-default, #626262);
183183
$ion-bg-neutral-base-default-rgb: var(--ion-bg-neutral-base-default-rgb, 98, 98, 98);
184184
$ion-bg-neutral-base-press: var(--ion-bg-neutral-base-press, #3b3b3b);

0 commit comments

Comments
 (0)