Skip to content

fix(VariantManagement): correct initial focus of manage views dialog #5329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2023
Merged

fix(VariantManagement): correct initial focus of manage views dialog #5329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions packages/main/src/components/VariantManagement/ManageViewsDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { isPhone, isTablet } from '@ui5/webcomponents-base/dist/Device.js';
import searchIcon from '@ui5/webcomponents-icons/dist/search.js';
import { enrichEventWithDetails, ThemingParameters, useI18nBundle } from '@ui5/webcomponents-react-base';
import {
enrichEventWithDetails,
ThemingParameters,
useI18nBundle,
useIsomorphicId
} from '@ui5/webcomponents-react-base';
import type { MouseEventHandler, ReactNode } from 'react';
import React, { Children, useEffect, useRef, useState } from 'react';
import { createPortal } from 'react-dom';
Expand Down Expand Up @@ -83,8 +88,8 @@ interface ManageViewsDialogPropTypes {
showSetAsDefault: boolean;
showCreatedBy: boolean;
variantNames: string[];
portalContainer: Element;
showOnlyFavorites?: boolean;
portalContainer: VariantManagementPropTypes['portalContainer'];
showOnlyFavorites?: VariantManagementPropTypes['showOnlyFavorites'];
onManageViewsCancel?: VariantManagementPropTypes['onManageViewsCancel'];
}

Expand All @@ -102,6 +107,7 @@ export const ManageViewsDialog = (props: ManageViewsDialogPropTypes) => {
showOnlyFavorites,
onManageViewsCancel
} = props;
const uniqueId = useIsomorphicId();
const i18nBundle = useI18nBundle('@ui5/webcomponents-react');
const cancelText = i18nBundle.getText(CANCEL);
const saveText = i18nBundle.getText(SAVE);
Expand Down Expand Up @@ -256,10 +262,12 @@ export const ManageViewsDialog = (props: ManageViewsDialogPropTypes) => {
onAfterClose={onAfterClose}
onBeforeClose={handleClose}
headerText={manageViewsText}
initialFocus={`search-${uniqueId}`}
header={
<FlexBox direction={FlexBoxDirection.Column} style={{ width: '100%' }} alignItems={FlexBoxAlignItems.Center}>
<h2 className={classes.headerText}>{manageViewsText}</h2>
<Input
id={`search-${uniqueId}`}
className={classes.search}
placeholder={searchText}
showClearIcon
Expand Down
5 changes: 3 additions & 2 deletions packages/main/src/components/VariantManagement/SaveViewDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ interface SaveViewDialogPropTypes {
showApplyAutomatically: boolean;
showSetAsDefault: boolean;
variantNames: string[];
portalContainer: Element;
portalContainer: VariantManagementPropTypes['portalContainer'];
saveViewInputProps?: Omit<InputPropTypes, 'value'>;
onSaveViewCancel?: VariantManagementPropTypes['onSaveViewCancel'];
}
Expand All @@ -64,7 +64,7 @@ export const SaveViewDialog = (props: SaveViewDialogPropTypes) => {
saveViewInputProps,
onSaveViewCancel
} = props;
const saveViewDialogRef = useRef<DialogDomRef>(null);
const saveViewDialogRef = useRef<DialogDomRef | null>(null);
const inputRef = useRef(undefined);
const i18nBundle = useI18nBundle('@ui5/webcomponents-react');
const classes = useStyles();
Expand Down Expand Up @@ -169,6 +169,7 @@ export const SaveViewDialog = (props: SaveViewDialogPropTypes) => {
headerText={headingText}
onAfterClose={onAfterClose}
onBeforeClose={handleClose}
initialFocus={`view-${uniqueId}`}
footer={
<Bar
design={BarDesign.Footer}
Expand Down