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
16 changes: 16 additions & 0 deletions core/src/components/segment-view/test/basic/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,22 @@
<ion-segment-content id="top">Top</ion-segment-content>
</ion-segment-view>

<ion-segment id="disabledFirstSegment" value="third">
<ion-segment-button value="first" disabled>
<ion-label>First</ion-label>
</ion-segment-button>
<ion-segment-button content-id="second-content" value="second">
<ion-label>Second</ion-label>
</ion-segment-button>
<ion-segment-button content-id="third-content" value="third">
<ion-label>Third</ion-label>
</ion-segment-button>
</ion-segment>
<ion-segment-view id="disabledFirstSegmentView">
<ion-segment-content id="second-content">Second Content</ion-segment-content>
<ion-segment-content id="third-content">Third Content</ion-segment-content>
</ion-segment-view>

<ion-segment value="peach" scrollable>
<ion-segment-button content-id="orange" value="orange">
<ion-label>Orange</ion-label>
Expand Down
33 changes: 33 additions & 0 deletions core/src/components/segment-view/test/basic/segment-view.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,38 @@ configs({ modes: ['md'] }).forEach(({ title, config }) => {
const segmentContent = page.locator('ion-segment-content[id="top"]');
await expect(segmentContent).toBeInViewport();
});
test('should not select a disabled first segment button when dragging segment-view from last content', async ({
page,
}) => {
await page.setContent(
`
<ion-segment id="disabledFirstSegment" scrollable="true" value="third">
<ion-segment-button value="first" disabled>
<ion-label>First</ion-label>
</ion-segment-button>
<ion-segment-button content-id="second-content" value="second">
<ion-label>Second</ion-label>
</ion-segment-button>
<ion-segment-button content-id="third-content" value="third">
<ion-label>Third</ion-label>
</ion-segment-button>
</ion-segment>
<ion-segment-view id="disabledFirstSegmentView">
<ion-segment-content id="second-content">Second Content</ion-segment-content>
<ion-segment-content id="third-content">Third Content</ion-segment-content>
</ion-segment-view>
`,
config
);
await page.waitForChanges();

await page.locator('ion-segment-view').evaluate((el: HTMLElement) => {
const max = el.scrollWidth - el.clientWidth;
el.scrollLeft = max;
});
await page.waitForChanges();

await expect(page.locator('ion-segment-button[value="first"]')).not.toHaveClass(/segment-button-checked/);
});
});
});
4 changes: 4 additions & 0 deletions core/src/components/segment/segment.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,10 @@ export class Segment implements ComponentInterface {

const nextIndex = Math.round(scrollRatio * (buttons.length - 1));

if (buttons[nextIndex]?.disabled) {
return;
}

if (this.lastNextIndex === undefined || this.lastNextIndex !== nextIndex) {
this.lastNextIndex = nextIndex;
this.triggerScrollOnValueChange = false;
Expand Down
Loading