keycloakify 7.0.0-rc.7 → 7.0.0

package/src/login/pages/LoginPassword.tsx

@@ -2,8 +2,8 @@ import { useState } from "react";
 import { clsx } from "keycloakify/tools/clsx";
 import { useConstCallback } from "keycloakify/tools/useConstCallback";
 import type { FormEventHandler } from "react";
-import { type PageProps, defaultClasses } from "keycloakify/login/pages/PageProps";
-import { useGetClassName } from "keycloakify/lib/useGetClassName";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
+import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
 
@@ -11,7 +11,7 @@ export default function LoginPassword(props: PageProps<Extract<KcContext, { "pag
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
     const { getClassName } = useGetClassName({
-        "defaultClasses": !doUseDefaultCss ? undefined : defaultClasses,
+        doUseDefaultCss,
         classes
     });
 

package/src/login/pages/LoginResetPassword.tsx

@@ -1,6 +1,6 @@
 import { clsx } from "keycloakify/tools/clsx";
-import { type PageProps, defaultClasses } from "keycloakify/login/pages/PageProps";
-import { useGetClassName } from "keycloakify/lib/useGetClassName";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
+import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
 
@@ -8,7 +8,7 @@ export default function LoginResetPassword(props: PageProps<Extract<KcContext, {
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
     const { getClassName } = useGetClassName({
-        "defaultClasses": !doUseDefaultCss ? undefined : defaultClasses,
+        doUseDefaultCss,
         classes
     });
 

package/src/login/pages/LoginUpdatePassword.tsx

@@ -1,6 +1,6 @@
 import { clsx } from "keycloakify/tools/clsx";
-import { type PageProps, defaultClasses } from "keycloakify/login/pages/PageProps";
-import { useGetClassName } from "keycloakify/lib/useGetClassName";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
+import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
 
@@ -8,7 +8,7 @@ export default function LoginUpdatePassword(props: PageProps<Extract<KcContext,
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
     const { getClassName } = useGetClassName({
-        "defaultClasses": !doUseDefaultCss ? undefined : defaultClasses,
+        doUseDefaultCss,
         classes
     });
 

package/src/login/pages/LoginUpdateProfile.tsx

@@ -1,6 +1,6 @@
 import { clsx } from "keycloakify/tools/clsx";
-import { type PageProps, defaultClasses } from "keycloakify/login/pages/PageProps";
-import { useGetClassName } from "keycloakify/lib/useGetClassName";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
+import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
 
@@ -8,7 +8,7 @@ export default function LoginUpdateProfile(props: PageProps<Extract<KcContext, {
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
     const { getClassName } = useGetClassName({
-        "defaultClasses": !doUseDefaultCss ? undefined : defaultClasses,
+        doUseDefaultCss,
         classes
     });
 

package/src/login/pages/LoginUsername.tsx

@@ -2,8 +2,8 @@ import type { FormEventHandler } from "react";
 import { useState } from "react";
 import { clsx } from "keycloakify/tools/clsx";
 import { useConstCallback } from "keycloakify/tools/useConstCallback";
-import { type PageProps, defaultClasses } from "keycloakify/login/pages/PageProps";
-import { useGetClassName } from "keycloakify/lib/useGetClassName";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
+import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
 
@@ -11,7 +11,7 @@ export default function LoginUsername(props: PageProps<Extract<KcContext, { page
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
     const { getClassName } = useGetClassName({
-        "defaultClasses": !doUseDefaultCss ? undefined : defaultClasses,
+        doUseDefaultCss,
         classes
     });
 

package/src/login/pages/LoginVerifyEmail.tsx

@@ -1,4 +1,4 @@
-import { type PageProps } from "keycloakify/login/pages/PageProps";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
 

package/src/login/pages/LogoutConfirm.tsx

@@ -1,6 +1,6 @@
 import { clsx } from "keycloakify/tools/clsx";
-import { type PageProps, defaultClasses } from "keycloakify/login/pages/PageProps";
-import { useGetClassName } from "keycloakify/lib/useGetClassName";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
+import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
 
@@ -8,7 +8,7 @@ export default function LogoutConfirm(props: PageProps<Extract<KcContext, { page
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
     const { getClassName } = useGetClassName({
-        "defaultClasses": !doUseDefaultCss ? undefined : defaultClasses,
+        doUseDefaultCss,
         classes
     });
 

package/src/login/pages/PageProps.ts

@@ -1,144 +1,11 @@
 import type { LazyExoticComponent } from "react";
 import type { I18n } from "keycloakify/login/i18n";
-import { type TemplateProps, type TemplateClassKey, defaultTemplateClasses } from "keycloakify/login/TemplateProps";
+import { type TemplateProps, type ClassKey } from "keycloakify/login/TemplateProps";
 
 export type PageProps<KcContext, I18nExtended extends I18n> = {
     Template: LazyExoticComponent<(props: TemplateProps<any, any>) => JSX.Element | null>;
     kcContext: KcContext;
     i18n: I18nExtended;
     doUseDefaultCss: boolean;
-    classes?: Partial<Record<TemplateClassKey | ClassKey, string>>;
-};
-
-export type ClassKey =
-    | TemplateClassKey
-    | "kcLogoClass"
-    | "kcContainerClass"
-    | "kcContentClass"
-    | "kcFeedbackAreaClass"
-    | "kcLocaleClass"
-    | "kcAlertIconClasserror"
-    | "kcFormAreaClass"
-    | "kcFormSocialAccountListClass"
-    | "kcFormSocialAccountDoubleListClass"
-    | "kcFormSocialAccountListLinkClass"
-    | "kcWebAuthnKeyIcon"
-    | "kcWebAuthnDefaultIcon"
-    | "kcFormClass"
-    | "kcFormGroupErrorClass"
-    | "kcLabelClass"
-    | "kcInputClass"
-    | "kcInputErrorMessageClass"
-    | "kcInputWrapperClass"
-    | "kcFormOptionsClass"
-    | "kcFormButtonsClass"
-    | "kcFormSettingClass"
-    | "kcTextareaClass"
-    | "kcInfoAreaClass"
-    | "kcFormGroupHeader"
-    | "kcButtonClass"
-    | "kcButtonPrimaryClass"
-    | "kcButtonDefaultClass"
-    | "kcButtonLargeClass"
-    | "kcButtonBlockClass"
-    | "kcInputLargeClass"
-    | "kcSrOnlyClass"
-    | "kcSelectAuthListClass"
-    | "kcSelectAuthListItemClass"
-    | "kcSelectAuthListItemFillClass"
-    | "kcSelectAuthListItemInfoClass"
-    | "kcSelectAuthListItemLeftClass"
-    | "kcSelectAuthListItemBodyClass"
-    | "kcSelectAuthListItemDescriptionClass"
-    | "kcSelectAuthListItemHeadingClass"
-    | "kcSelectAuthListItemHelpTextClass"
-    | "kcSelectAuthListItemIconPropertyClass"
-    | "kcSelectAuthListItemIconClass"
-    | "kcSelectAuthListItemTitle"
-    | "kcAuthenticatorDefaultClass"
-    | "kcAuthenticatorPasswordClass"
-    | "kcAuthenticatorOTPClass"
-    | "kcAuthenticatorWebAuthnClass"
-    | "kcAuthenticatorWebAuthnPasswordlessClass"
-    | "kcSelectOTPListClass"
-    | "kcSelectOTPListItemClass"
-    | "kcAuthenticatorOtpCircleClass"
-    | "kcSelectOTPItemHeadingClass"
-    | "kcFormOptionsWrapperClass";
-
-export const defaultClasses: Record<ClassKey, string | undefined> = {
-    ...defaultTemplateClasses,
-
-    "kcLogoClass": "login-pf-brand",
-    "kcContainerClass": "container-fluid",
-    "kcContentClass": "col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3 col-lg-6 col-lg-offset-3",
-    "kcFeedbackAreaClass": "col-md-12",
-    "kcLocaleClass": "col-xs-12 col-sm-1",
-    "kcAlertIconClasserror": "pficon pficon-error-circle-o",
-
-    "kcFormAreaClass": "col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-2 col-lg-8 col-lg-offset-2",
-    "kcFormSocialAccountListClass": "login-pf-social list-unstyled login-pf-social-all",
-    "kcFormSocialAccountDoubleListClass": "login-pf-social-double-col",
-    "kcFormSocialAccountListLinkClass": "login-pf-social-link",
-    "kcWebAuthnKeyIcon": "pficon pficon-key",
-    "kcWebAuthnDefaultIcon": "pficon pficon-key",
-
-    "kcFormClass": "form-horizontal",
-    "kcFormGroupErrorClass": "has-error",
-    "kcLabelClass": "control-label",
-    "kcInputClass": "form-control",
-    "kcInputErrorMessageClass": "pf-c-form__helper-text pf-m-error required kc-feedback-text",
-    "kcInputWrapperClass": "col-xs-12 col-sm-12 col-md-12 col-lg-12",
-    "kcFormOptionsClass": "col-xs-12 col-sm-12 col-md-12 col-lg-12",
-    "kcFormButtonsClass": "col-xs-12 col-sm-12 col-md-12 col-lg-12",
-    "kcFormSettingClass": "login-pf-settings",
-    "kcTextareaClass": "form-control",
-
-    "kcInfoAreaClass": "col-xs-12 col-sm-4 col-md-4 col-lg-5 details",
-
-    // user-profile grouping
-    "kcFormGroupHeader": "pf-c-form__group",
-
-    // css classes for form buttons main class used for all buttons
-    "kcButtonClass": "btn",
-    // classes defining priority of the button - primary or default (there is typically only one priority button for the form)
-    "kcButtonPrimaryClass": "btn-primary",
-    "kcButtonDefaultClass": "btn-default",
-    // classes defining size of the button
-    "kcButtonLargeClass": "btn-lg",
-    "kcButtonBlockClass": "btn-block",
-
-    // css classes for input
-    "kcInputLargeClass": "input-lg",
-
-    // css classes for form accessability
-    "kcSrOnlyClass": "sr-only",
-
-    // css classes for select-authenticator form
-    "kcSelectAuthListClass": "list-group list-view-pf",
-    "kcSelectAuthListItemClass": "list-group-item list-view-pf-stacked",
-    "kcSelectAuthListItemFillClass": "pf-l-split__item pf-m-fill",
-    "kcSelectAuthListItemIconPropertyClass": "fa-2x select-auth-box-icon-properties",
-    "kcSelectAuthListItemIconClass": "pf-l-split__item select-auth-box-icon",
-    "kcSelectAuthListItemTitle": "select-auth-box-paragraph",
-    "kcSelectAuthListItemInfoClass": "list-view-pf-main-info",
-    "kcSelectAuthListItemLeftClass": "list-view-pf-left",
-    "kcSelectAuthListItemBodyClass": "list-view-pf-body",
-    "kcSelectAuthListItemDescriptionClass": "list-view-pf-description",
-    "kcSelectAuthListItemHeadingClass": "list-group-item-heading",
-    "kcSelectAuthListItemHelpTextClass": "list-group-item-text",
-
-    // css classes for the authenticators
-    "kcAuthenticatorDefaultClass": "fa list-view-pf-icon-lg",
-    "kcAuthenticatorPasswordClass": "fa fa-unlock list-view-pf-icon-lg",
-    "kcAuthenticatorOTPClass": "fa fa-mobile list-view-pf-icon-lg",
-    "kcAuthenticatorWebAuthnClass": "fa fa-key list-view-pf-icon-lg",
-    "kcAuthenticatorWebAuthnPasswordlessClass": "fa fa-key list-view-pf-icon-lg",
-
-    //css classes for the OTP Login Form
-    "kcSelectOTPListClass": "card-pf card-pf-view card-pf-view-select card-pf-view-single-select",
-    "kcSelectOTPListItemClass": "card-pf-body card-pf-top-element",
-    "kcAuthenticatorOtpCircleClass": "fa fa-mobile card-pf-icon-circle",
-    "kcSelectOTPItemHeadingClass": "card-pf-title text-center",
-    "kcFormOptionsWrapperClass": undefined
+    classes?: Partial<Record<ClassKey, string>>;
 };

package/src/login/pages/Register.tsx

@@ -1,6 +1,6 @@
 import { clsx } from "keycloakify/tools/clsx";
-import { type PageProps, defaultClasses } from "keycloakify/login/pages/PageProps";
-import { useGetClassName } from "keycloakify/lib/useGetClassName";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
+import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
 
@@ -8,7 +8,7 @@ export default function Register(props: PageProps<Extract<KcContext, { pageId: "
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
     const { getClassName } = useGetClassName({
-        "defaultClasses": !doUseDefaultCss ? undefined : defaultClasses,
+        doUseDefaultCss,
         classes
     });
 

package/src/login/pages/RegisterUserProfile.tsx

@@ -1,8 +1,8 @@
 import { useState } from "react";
 import { clsx } from "keycloakify/tools/clsx";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
-import { type PageProps, defaultClasses } from "keycloakify/login/pages/PageProps";
-import { useGetClassName } from "keycloakify/lib/useGetClassName";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
+import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
 
@@ -10,7 +10,7 @@ export default function RegisterUserProfile(props: PageProps<Extract<KcContext,
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
     const { getClassName } = useGetClassName({
-        "defaultClasses": !doUseDefaultCss ? undefined : defaultClasses,
+        doUseDefaultCss,
         classes
     });
 

package/src/login/pages/Terms.tsx

@@ -1,8 +1,8 @@
 import { clsx } from "keycloakify/tools/clsx";
 import { useRerenderOnStateChange } from "evt/hooks";
 import { Markdown } from "keycloakify/tools/Markdown";
-import { type PageProps, defaultClasses } from "keycloakify/login/pages/PageProps";
-import { useGetClassName } from "keycloakify/lib/useGetClassName";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
+import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import { evtTermMarkdown } from "keycloakify/login/lib/useDownloadTerms";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
@@ -11,7 +11,7 @@ export default function Terms(props: PageProps<Extract<KcContext, { pageId: "ter
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
     const { getClassName } = useGetClassName({
-        "defaultClasses": !doUseDefaultCss ? undefined : defaultClasses,
+        doUseDefaultCss,
         classes
     });
 

package/src/login/pages/UpdateUserProfile.tsx

@@ -1,8 +1,8 @@
 import { useState } from "react";
 import { clsx } from "keycloakify/tools/clsx";
 import { UserProfileFormFields } from "keycloakify/login/pages/shared/UserProfileCommons";
-import { type PageProps, defaultClasses } from "keycloakify/login/pages/PageProps";
-import { useGetClassName } from "keycloakify/lib/useGetClassName";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
+import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
 
@@ -10,7 +10,7 @@ export default function UpdateUserProfile(props: PageProps<Extract<KcContext, {
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
     const { getClassName } = useGetClassName({
-        "defaultClasses": !doUseDefaultCss ? undefined : defaultClasses,
+        doUseDefaultCss,
         classes
     });
 

package/src/login/pages/WebauthnAuthenticate.tsx

@@ -3,18 +3,15 @@ import { clsx } from "keycloakify/tools/clsx";
 import type { MessageKey } from "keycloakify/login/i18n/i18n";
 import { base64url } from "rfc4648";
 import { useConstCallback } from "keycloakify/tools/useConstCallback";
-import { type PageProps, defaultClasses } from "keycloakify/login/pages/PageProps";
-import { useGetClassName } from "keycloakify/lib/useGetClassName";
+import type { PageProps } from "keycloakify/login/pages/PageProps";
+import { useGetClassName } from "keycloakify/login/lib/useGetClassName";
 import type { KcContext } from "../kcContext";
 import type { I18n } from "../i18n";
 
 export default function WebauthnAuthenticate(props: PageProps<Extract<KcContext, { pageId: "webauthn-authenticate.ftl" }>, I18n>) {
     const { kcContext, i18n, doUseDefaultCss, Template, classes } = props;
 
-    const { getClassName } = useGetClassName({
-        "defaultClasses": !doUseDefaultCss ? undefined : defaultClasses,
-        classes
-    });
+    const { getClassName } = useGetClassName({ doUseDefaultCss, classes });
 
     const { url } = kcContext;
 

package/src/login/pages/shared/UserProfileCommons.tsx

@@ -1,5 +1,5 @@
 import { useEffect, Fragment } from "react";
-import type { ClassKey } from "keycloakify/login/pages/PageProps";
+import type { ClassKey } from "keycloakify/login/TemplateProps";
 import { clsx } from "keycloakify/tools/clsx";
 import { useFormValidation } from "keycloakify/login/lib/useFormValidation";
 import type { Attribute } from "keycloakify/login/kcContext/KcContext";

package/src/tools/AndByDiscriminatingKey.ts

@@ -10,7 +10,11 @@ export declare namespace AndByDiscriminatingKey {
         U1,
         U1Again extends Record<DiscriminatingKey, string>,
         U2 extends Record<DiscriminatingKey, string>
-    > = U1 extends Pick<U2, DiscriminatingKey> ? Tf2<DiscriminatingKey, U1, U2, U1Again> : U1;
+    > = U1 extends Pick<U2, DiscriminatingKey>
+        ? Tf2<DiscriminatingKey, U1, U2, U1Again>
+        : U1Again[DiscriminatingKey] & U2[DiscriminatingKey] extends never
+        ? U1 | U2
+        : U1;
 
     export type Tf2<
         DiscriminatingKey extends string,

package/tools/AndByDiscriminatingKey.d.ts

@@ -1,5 +1,5 @@
 export type AndByDiscriminatingKey<DiscriminatingKey extends string, U1 extends Record<DiscriminatingKey, string>, U2 extends Record<DiscriminatingKey, string>> = AndByDiscriminatingKey.Tf1<DiscriminatingKey, U1, U1, U2>;
 export declare namespace AndByDiscriminatingKey {
-    type Tf1<DiscriminatingKey extends string, U1, U1Again extends Record<DiscriminatingKey, string>, U2 extends Record<DiscriminatingKey, string>> = U1 extends Pick<U2, DiscriminatingKey> ? Tf2<DiscriminatingKey, U1, U2, U1Again> : U1;
+    type Tf1<DiscriminatingKey extends string, U1, U1Again extends Record<DiscriminatingKey, string>, U2 extends Record<DiscriminatingKey, string>> = U1 extends Pick<U2, DiscriminatingKey> ? Tf2<DiscriminatingKey, U1, U2, U1Again> : U1Again[DiscriminatingKey] & U2[DiscriminatingKey] extends never ? U1 | U2 : U1;
     type Tf2<DiscriminatingKey extends string, SingletonU1 extends Record<DiscriminatingKey, string>, U2, U1 extends Record<DiscriminatingKey, string>> = U2 extends Pick<SingletonU1, DiscriminatingKey> ? U2 & SingletonU1 : U2 extends Pick<U1, DiscriminatingKey> ? never : U2;
 }