Skip to content
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.

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

Fix: Default overlay on collections review panel #2377

Merged
merged 12 commits into from
Feb 7, 2023
17 changes: 15 additions & 2 deletions src/app/views/query-runner/request/permissions/PanelList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const PanelList = ({ messages,
}

const { consentedScopes, scopes, authToken,
permissionsPanelOpen } = useAppSelector((state) => state);
permissionsPanelOpen, theme: appTheme } = useAppSelector((state) => state);
const { fullPermissions } = scopes.data;
const [permissions, setPermissions] = useState<any []>([]);
const [groups, setGroups] = useState<IGroup[]>([]);
Expand Down Expand Up @@ -117,8 +117,21 @@ const PanelList = ({ messages,
});
};

const isCurrentThemeDark = (): boolean => {
if (appTheme === 'dark' || appTheme === 'high-contrast') {
return true;
}
return false;
}

const panelOverlayProps: IOverlayProps = {
isDarkThemed: true
styles: {
root: {
backgroundColor: isCurrentThemeDark() ? theme.palette.neutralLighter :
theme.palette.whiteTranslucent40,
opacity: '0.8'
}
}
}

const displayLoadingPermissionsText = () => {
Expand Down
23 changes: 21 additions & 2 deletions src/app/views/sidebar/resource-explorer/panels/PathsReview.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {
CommandBar, ICommandBarItemProps, Label, Panel, PanelType, PrimaryButton
CommandBar, getTheme, ICommandBarItemProps, IOverlayProps, Label, Panel, PanelType, PrimaryButton
} from '@fluentui/react';
import { useState } from 'react';
import { FormattedMessage } from 'react-intl';
Expand All @@ -21,12 +21,13 @@ export interface IPathsReview {

const PathsReview = (props: IPathsReview) => {
const dispatch: AppDispatch = useDispatch();
const { resources: { paths: items } } = useAppSelector(
const { resources: { paths: items }, theme } = useAppSelector(
(state) => state
);
const { isOpen } = props;
const headerText = translateMessage('Selected Resources') + ' ' + translateMessage('Preview');
const [selectedItems, setSelectedItems] = useState<IResourceLink[]>([]);
const currentTheme = getTheme();

const columns = [
{ key: 'url', name: 'URL', fieldName: 'url', minWidth: 300, maxWidth: 350, isResizable: true }
Expand Down Expand Up @@ -67,6 +68,23 @@ const PathsReview = (props: IPathsReview) => {
setSelectedItems(content);
};

const isCurrentThemeDark = (): boolean => {
if (theme === 'dark' || theme === 'high-contrast') {
return true;
}
return false;
}

const panelOverlayProps: IOverlayProps = {
styles: {
root: {
backgroundColor: isCurrentThemeDark() ? currentTheme.palette.neutralLighter :
currentTheme.palette.whiteTranslucent40,
opacity: '0.8'
}
}
}

return (
<>
<Panel
Expand All @@ -76,6 +94,7 @@ const PathsReview = (props: IPathsReview) => {
type={PanelType.large}
onRenderFooterContent={renderFooterContent}
closeButtonAriaLabel='Close'
overlayProps={panelOverlayProps}
>
<Label>
<FormattedMessage id='Export list as a Postman collection message' />
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.