Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Backport to fix issue related to dark mode in DropdownPanel #30524

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
agagancarczyk merged 2 commits into from
Jun 19, 2024
Merged

Backport to fix issue related to dark mode in DropdownPanel #30524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc7a92
backport for issue-30510
agagancarczyk Jun 18, 2024
39639af
Merge branch 'release/25.0' into backport-30510
agagancarczyk Jun 19, 2024
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
11 changes: 10 additions & 1 deletion js/apps/admin-ui/src/components/dropdown-panel/DropdownPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useEffect, useRef } from "react";
import { Icon } from "@patternfly/react-core";
import { CaretDownIcon } from "@patternfly/react-icons";
import { mediaQuery } from "../../util";
import "./dropdown-panel.css";

type DropdownPanelProps = {
Expand Down Expand Up @@ -63,7 +64,15 @@ const DropdownPanel: React.FC<DropdownPanelProps> = ({
</Icon>
</button>
{searchDropdownOpen && (
<div className="kc-dropdown-panel-content">{children}</div>
<div
className={
mediaQuery?.matches
? "kc-dropdown-panel-content dark-mode"
: "kc-dropdown-panel-content light-mode"
}
>
{children}
</div>
)}
</span>
);
Expand Down
15 changes: 11 additions & 4 deletions js/apps/admin-ui/src/components/dropdown-panel/dropdown-panel.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
.kc-dropdown-panel {
background-color: transparent;
padding: var(--pf-v5-global--spacer--form-element) var(--pf-v5-global--spacer--sm)
var(--pf-v5-global--spacer--form-element) var(--pf-v5-global--spacer--sm);
border-color: var(--pf-v5-global--BorderColor--300)
var(--pf-v5-global--BorderColor--300) var(--pf-v5-global--BorderColor--200)
padding: var(--pf-v5-global--spacer--form-element) var(--pf-v5-global--spacer--sm) var(--pf-v5-global--spacer--form-element)
var(--pf-v5-global--spacer--sm);
border-color: var(--pf-v5-global--BorderColor--300) var(--pf-v5-global--BorderColor--300) var(--pf-v5-global--BorderColor--200)
var(--pf-v5-global--BorderColor--300);
border-width: var(--pf-v5-global--BorderWidth--sm);
border-style: solid;
Expand Down Expand Up @@ -36,3 +35,11 @@
padding: 0.75rem;
z-index: 1;
}

.light-mode {
background-color: var(--pf-v5-global--Color--light-100);
}

.dark-mode {
background-color: var(--pf-v5-global--BackgroundColor--300);
}
4 changes: 3 additions & 1 deletion js/apps/admin-ui/src/components/users/UserDataTableAttributeSearchForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,9 @@ export function UserDataTableAttributeSearchForm({
setSelectAttributeKeyOpen(false);
setValue("name", option.name!);
}}
/>
>
{label(t, option.displayName!, option.name)}
</SelectOption>
))}
</KeycloakSelect>
);
Expand Down
8 changes: 6 additions & 2 deletions js/apps/admin-ui/src/events/AdminEvents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,9 @@ export const AdminEvents = () => {
}
>
{resourceTypes?.map((option) => (
<SelectOption key={option} value={option} />
<SelectOption key={option} value={option}>
{option}
</SelectOption>
))}
</KeycloakSelect>
)}
Expand Down Expand Up @@ -399,7 +401,9 @@ export const AdminEvents = () => {
<SelectOption
key={option.toString()}
value={option}
/>
>
{option}
</SelectOption>
))}
</KeycloakSelect>
)}
Expand Down
2 changes: 1 addition & 1 deletion js/apps/admin-ui/src/realm-settings/ThemesTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export const RealmSettingsThemesTab = ({
isOpen={adminUIThemeOpen}
placeholderText={t("selectATheme")}
data-testid="select-admin-theme"
aria-label="selectAdminTheme"
aria-label={t("selectAdminTheme")}
>
{themeTypes.admin
.filter((theme) => theme.name !== "base")
Expand Down
33 changes: 20 additions & 13 deletions js/apps/admin-ui/src/realm-settings/localization/EffectiveMessageBundles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ export const EffectiveMessageBundles = ({
<Controller
name="theme"
control={control}
defaultValue=""
rules={{
validate: (value) => (value || "").length > 0,
}}
Expand All @@ -252,7 +253,7 @@ export const EffectiveMessageBundles = ({
field.onChange("");
}}
isOpen={selectThemesOpen}
aria-labelledby={t("theme")}
aria-label={t("selectTheme")}
chipGroupComponent={
<ChipGroup>
<Chip
Expand All @@ -270,14 +271,16 @@ export const EffectiveMessageBundles = ({
{[
<SelectOption
key="theme_placeholder"
value="Select theme"
label={t("selectTheme")}
className="kc__effective_message_bundles_search_theme__placeholder"
isDisabled
/>,
>
{t("selectTheme")}
</SelectOption>,
].concat(
themeNames.map((option) => (
<SelectOption key={option} value={option} />
<SelectOption key={option} value={option}>
{option}
</SelectOption>
)),
)}
</KeycloakSelect>
Expand All @@ -292,6 +295,7 @@ export const EffectiveMessageBundles = ({
<Controller
name="themeType"
control={control}
defaultValue=""
rules={{
validate: (value) => (value || "").length > 0,
}}
Expand All @@ -315,7 +319,7 @@ export const EffectiveMessageBundles = ({
field.onChange("");
}}
isOpen={selectThemeTypeOpen}
aria-labelledby={t("themeType")}
aria-label={t("selectThemeType")}
chipGroupComponent={
<ChipGroup>
<Chip
Expand All @@ -333,14 +337,16 @@ export const EffectiveMessageBundles = ({
{[
<SelectOption
key="themeType_placeholder"
value="Select theme type"
label={t("selectThemeType")}
className="pf-m-plain"
isDisabled
/>,
>
{t("selectThemeType")}
</SelectOption>,
].concat(
themeTypes.map((option) => (
<SelectOption key={option} value={option} />
<SelectOption key={option} value={option}>
{option}
</SelectOption>
)),
)}
</KeycloakSelect>
Expand All @@ -351,6 +357,7 @@ export const EffectiveMessageBundles = ({
<Controller
name="locale"
control={control}
defaultValue=""
rules={{
validate: (value) => (value || "").length > 0,
}}
Expand Down Expand Up @@ -397,11 +404,11 @@ export const EffectiveMessageBundles = ({
{[
<SelectOption
key="language_placeholder"
value="Select language"
label={t("selectLanguage")}
className="pf-m-plain"
isDisabled
/>,
>
{t("selectLanguage")}
</SelectOption>,
].concat(
combinedLocales.map((option) => (
<SelectOption key={option} value={option}>
Expand Down
9 changes: 5 additions & 4 deletions js/apps/admin-ui/src/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,10 @@ export function convertAttributeNameToForm<T>(
name: string,
): PathValue<T, Path<T>> {
const index = name.indexOf(".");
return `${name.substring(0, index)}.${beerify(
name.substring(index + 1),
)}` as PathValue<T, Path<T>>;
return `${name.substring(0, index)}.${beerify(name.substring(index + 1))}` as PathValue<
T,
Path<T>
>;
}

export const beerify = <T extends string>(name: T) =>
Expand Down Expand Up @@ -183,7 +184,7 @@ export const localeToDisplayName = (locale: string, displayLocale: string) => {
};

const DARK_MODE_CLASS = "pf-v5-theme-dark";
const mediaQuery =
export const mediaQuery =
window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)");

updateDarkMode(mediaQuery?.matches);
Expand Down