[EuiFocusTrap] Default to not trapping focus across iframes #6908
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| import type { Meta, StoryObj } from '@storybook/react'; | ||
| import React, { useState } from 'react'; | ||
|
|
||
| import { EuiButton } from '../button'; | ||
| import { EuiFieldText } from '../form'; | ||
| import { EuiSpacer } from '../spacer'; | ||
| import { EuiPanel } from '../panel'; | ||
|
|
||
| import { EuiFocusTrap, EuiFocusTrapProps } from './focus_trap'; | ||
|
|
||
| const meta: Meta<EuiFocusTrapProps> = { | ||
| title: 'EuiFocusTrap', | ||
| // @ts-ignore This still works for Storybook controls, even though Typescript complains | ||
| component: EuiFocusTrap, | ||
| argTypes: { | ||
| crossFrame: { | ||
| control: { type: 'boolean' }, | ||
| }, | ||
| }, | ||
| }; | ||
|
|
||
| export default meta; | ||
| type Story = StoryObj<EuiFocusTrapProps>; | ||
|
|
||
| const StatefulFocusTrap = (props: Partial<EuiFocusTrapProps>) => { | ||
| const [disabled, setDisabled] = useState(props.disabled); | ||
| return ( | ||
| <> | ||
| <EuiButton size="s" onClick={() => setDisabled(!disabled)}> | ||
| Toggle focus trap | ||
| </EuiButton> | ||
| <EuiSpacer /> | ||
| <EuiPanel> | ||
| <EuiFocusTrap {...props} disabled={disabled}> | ||
| Focus trap is currently {disabled ? 'disabled' : 'enabled'} | ||
| <EuiFieldText /> | ||
| <EuiButton size="s">Button inside focus trap</EuiButton> | ||
| </EuiFocusTrap> | ||
| </EuiPanel> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export const Playground: Story = { | ||
| render: ({ ...args }) => <StatefulFocusTrap {...args} />, | ||
| args: { | ||
| disabled: true, | ||
| }, | ||
| }; | ||
|
|
||
| export const Iframe: Story = { | ||
| render: ({ ...args }) => ( | ||
| <> | ||
| <EuiFieldText placeholder="Focusable item outside iframe" /> | ||
| <EuiSpacer /> | ||
| <EuiPanel> | ||
| Iframe content | ||
| <iframe | ||
| title="crossFrame test" | ||
| src={`/iframe.html?id=euifocustrap--playground&crossFrame=${args.crossFrame}`} | ||
| style={{ width: '100%', height: 200 }} | ||
| sandbox="allow-forms allow-modals allow-popups allow-same-origin allow-scripts allow-downloads allow-storage-access-by-user-activation" | ||
| /> | ||
| </EuiPanel> | ||
| </> | ||
| ), | ||
| args: { disabled: true, crossFrame: false }, | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| - `EuiFocusTrap` now supports configuring cross-iframe focus trapping via the `crossFrame` prop | ||
|
|
||
| **Breaking changes** | ||
|
|
||
| - `EuiFocusTrap` now defaults to *not* trapping focus across iframes | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This resolution is necessary as latest
react-focus-onstill points to2.9.4which doesn't yet have thereact-focus-lockfix we need (theKashey/react-focus-lock#249). Oncereact-focus-onupdates, we can remove this resolution