keycloakify 6.8.3 → 6.8.4

package/src/lib/components/RegisterUserProfile.tsx

@@ -1,9 +1,9 @@
-import React, { useMemo, memo, useState } from "react";
+import React, { memo, useState } from "react";
 import DefaultTemplate from "./Template";
 import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useCssAndCx } from "../tools/useCssAndCx";
+import { clsx } from "../tools/clsx";
 import type { I18n } from "../i18n";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
@@ -15,22 +15,12 @@ export type RegisterUserProfileProps = KcProps & {
 };
 
 const RegisterUserProfile = memo((props: RegisterUserProfileProps) => {
-    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps_ } = props;
+    const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
     const { url, messagesPerField, recaptchaRequired, recaptchaSiteKey } = kcContext;
 
     const { msg, msgStr } = i18n;
 
-    const { cx, css } = useCssAndCx();
-
-    const kcProps = useMemo(
-        () => ({
-            ...kcProps_,
-            "kcFormGroupClass": cx(kcProps_.kcFormGroupClass, css({ "marginBottom": 20 }))
-        }),
-        [cx, css]
-    );
-
     const [isFomSubmittable, setIsFomSubmittable] = useState(false);
 
     return (
@@ -40,27 +30,27 @@ const RegisterUserProfile = memo((props: RegisterUserProfileProps) => {
             displayRequiredFields={true}
             headerNode={msg("registerTitle")}
             formNode={
-                <form id="kc-register-form" className={cx(kcProps.kcFormClass)} action={url.registrationAction} method="post">
+                <form id="kc-register-form" className={clsx(kcProps.kcFormClass)} action={url.registrationAction} method="post">
                     <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...kcProps} />
                     {recaptchaRequired && (
                         <div className="form-group">
-                            <div className={cx(kcProps.kcInputWrapperClass)}>
+                            <div className={clsx(kcProps.kcInputWrapperClass)}>
                                 <div className="g-recaptcha" data-size="compact" data-sitekey={recaptchaSiteKey} />
                             </div>
                         </div>
                     )}
-                    <div className={cx(kcProps.kcFormGroupClass)}>
-                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
-                            <div className={cx(kcProps.kcFormOptionsWrapperClass)}>
+                    <div className={clsx(kcProps.kcFormGroupClass)} style={{ "marginBottom": 30 }}>
+                        <div id="kc-form-options" className={clsx(kcProps.kcFormOptionsClass)}>
+                            <div className={clsx(kcProps.kcFormOptionsWrapperClass)}>
                                 <span>
                                     <a href={url.loginUrl}>{msg("backToLogin")}</a>
                                 </span>
                             </div>
                         </div>
 
-                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
+                        <div id="kc-form-buttons" className={clsx(kcProps.kcFormButtonsClass)}>
                             <input
-                                className={cx(
+                                className={clsx(
                                     kcProps.kcButtonClass,
                                     kcProps.kcButtonPrimaryClass,
                                     kcProps.kcButtonBlockClass,

package/src/lib/components/Template.tsx

@@ -7,7 +7,7 @@ import { headInsert } from "../tools/headInsert";
 import { pathJoin } from "../../bin/tools/pathJoin";
 import { useConstCallback } from "powerhooks/useConstCallback";
 import type { KcTemplateProps } from "./KcProps";
-import { useCssAndCx } from "../tools/useCssAndCx";
+import { clsx } from "../tools/clsx";
 import type { I18n } from "../i18n";
 
 export type TemplateProps = {
@@ -42,8 +42,6 @@ const Template = memo((props: TemplateProps) => {
         doFetchDefaultThemeResources
     } = props;
 
-    const { cx } = useCssAndCx();
-
     const { msg, changeLocale, labelBySupportedLanguageTag, currentLanguageTag } = i18n;
 
     const onChangeLanguageClickFactory = useCallbackFactory(([kcLanguageTag]: [string]) => changeLocale(kcLanguageTag));
@@ -96,7 +94,7 @@ const Template = memo((props: TemplateProps) => {
         if (props.kcHtmlClass !== undefined) {
             const htmlClassList = document.getElementsByTagName("html")[0].classList;
 
-            const tokens = cx(props.kcHtmlClass).split(" ");
+            const tokens = clsx(props.kcHtmlClass).split(" ");
 
             htmlClassList.add(...tokens);
 
@@ -115,18 +113,18 @@ const Template = memo((props: TemplateProps) => {
     }
 
     return (
-        <div className={cx(props.kcLoginClass)}>
-            <div id="kc-header" className={cx(props.kcHeaderClass)}>
-                <div id="kc-header-wrapper" className={cx(props.kcHeaderWrapperClass)}>
+        <div className={clsx(props.kcLoginClass)}>
+            <div id="kc-header" className={clsx(props.kcHeaderClass)}>
+                <div id="kc-header-wrapper" className={clsx(props.kcHeaderWrapperClass)}>
                     {msg("loginTitleHtml", realm.displayNameHtml)}
                 </div>
             </div>
 
-            <div className={cx(props.kcFormCardClass, displayWide && props.kcFormCardAccountClass)}>
-                <header className={cx(props.kcFormHeaderClass)}>
+            <div className={clsx(props.kcFormCardClass, displayWide && props.kcFormCardAccountClass)}>
+                <header className={clsx(props.kcFormHeaderClass)}>
                     {realm.internationalizationEnabled && (assert(locale !== undefined), true) && locale.supported.length > 1 && (
                         <div id="kc-locale">
-                            <div id="kc-locale-wrapper" className={cx(props.kcLocaleWrapperClass)}>
+                            <div id="kc-locale-wrapper" className={clsx(props.kcLocaleWrapperClass)}>
                                 <div className="kc-dropdown" id="kc-locale-dropdown">
                                     <a href="#" id="kc-current-locale-link">
                                         {labelBySupportedLanguageTag[currentLanguageTag]}
@@ -146,8 +144,8 @@ const Template = memo((props: TemplateProps) => {
                     )}
                     {!(auth !== undefined && auth.showUsername && !auth.showResetCredentials) ? (
                         displayRequiredFields ? (
-                            <div className={cx(props.kcContentWrapperClass)}>
-                                <div className={cx(props.kcLabelWrapperClass, "subtitle")}>
+                            <div className={clsx(props.kcContentWrapperClass)}>
+                                <div className={clsx(props.kcLabelWrapperClass, "subtitle")}>
                                     <span className="subtitle">
                                         <span className="required">*</span>
                                         {msg("requiredFields")}
@@ -161,20 +159,20 @@ const Template = memo((props: TemplateProps) => {
                             <h1 id="kc-page-title">{headerNode}</h1>
                         )
                     ) : displayRequiredFields ? (
-                        <div className={cx(props.kcContentWrapperClass)}>
-                            <div className={cx(props.kcLabelWrapperClass, "subtitle")}>
+                        <div className={clsx(props.kcContentWrapperClass)}>
+                            <div className={clsx(props.kcLabelWrapperClass, "subtitle")}>
                                 <span className="subtitle">
                                     <span className="required">*</span> {msg("requiredFields")}
                                 </span>
                             </div>
                             <div className="col-md-10">
                                 {showUsernameNode}
-                                <div className={cx(props.kcFormGroupClass)}>
+                                <div className={clsx(props.kcFormGroupClass)}>
                                     <div id="kc-username">
                                         <label id="kc-attempted-username">{auth?.attemptedUsername}</label>
                                         <a id="reset-login" href={url.loginRestartFlowUrl}>
                                             <div className="kc-login-tooltip">
-                                                <i className={cx(props.kcResetFlowIcon)}></i>
+                                                <i className={clsx(props.kcResetFlowIcon)}></i>
                                                 <span className="kc-tooltip-text">{msg("restartLoginTooltip")}</span>
                                             </div>
                                         </a>
@@ -185,12 +183,12 @@ const Template = memo((props: TemplateProps) => {
                     ) : (
                         <>
                             {showUsernameNode}
-                            <div className={cx(props.kcFormGroupClass)}>
+                            <div className={clsx(props.kcFormGroupClass)}>
                                 <div id="kc-username">
                                     <label id="kc-attempted-username">{auth?.attemptedUsername}</label>
                                     <a id="reset-login" href={url.loginRestartFlowUrl}>
                                         <div className="kc-login-tooltip">
-                                            <i className={cx(props.kcResetFlowIcon)}></i>
+                                            <i className={clsx(props.kcResetFlowIcon)}></i>
                                             <span className="kc-tooltip-text">{msg("restartLoginTooltip")}</span>
                                         </div>
                                     </a>
@@ -203,11 +201,11 @@ const Template = memo((props: TemplateProps) => {
                     <div id="kc-content-wrapper">
                         {/* App-initiated actions should not see warning messages about the need to complete the action during login. */}
                         {displayMessage && message !== undefined && (message.type !== "warning" || !isAppInitiatedAction) && (
-                            <div className={cx("alert", `alert-${message.type}`)}>
-                                {message.type === "success" && <span className={cx(props.kcFeedbackSuccessIcon)}></span>}
-                                {message.type === "warning" && <span className={cx(props.kcFeedbackWarningIcon)}></span>}
-                                {message.type === "error" && <span className={cx(props.kcFeedbackErrorIcon)}></span>}
-                                {message.type === "info" && <span className={cx(props.kcFeedbackInfoIcon)}></span>}
+                            <div className={clsx("alert", `alert-${message.type}`)}>
+                                {message.type === "success" && <span className={clsx(props.kcFeedbackSuccessIcon)}></span>}
+                                {message.type === "warning" && <span className={clsx(props.kcFeedbackWarningIcon)}></span>}
+                                {message.type === "error" && <span className={clsx(props.kcFeedbackErrorIcon)}></span>}
+                                {message.type === "info" && <span className={clsx(props.kcFeedbackInfoIcon)}></span>}
                                 <span
                                     className="kc-feedback-text"
                                     dangerouslySetInnerHTML={{
@@ -222,10 +220,10 @@ const Template = memo((props: TemplateProps) => {
                                 id="kc-select-try-another-way-form"
                                 action={url.loginAction}
                                 method="post"
-                                className={cx(displayWide && props.kcContentWrapperClass)}
+                                className={clsx(displayWide && props.kcContentWrapperClass)}
                             >
-                                <div className={cx(displayWide && [props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass])}>
-                                    <div className={cx(props.kcFormGroupClass)}>
+                                <div className={clsx(displayWide && [props.kcFormSocialAccountContentClass, props.kcFormSocialAccountClass])}>
+                                    <div className={clsx(props.kcFormGroupClass)}>
                                         <input type="hidden" name="tryAnotherWay" value="on" />
                                         <a href="#" id="try-another-way" onClick={onTryAnotherWayClick}>
                                             {msg("doTryAnotherWay")}
@@ -235,8 +233,8 @@ const Template = memo((props: TemplateProps) => {
                             </form>
                         )}
                         {displayInfo && (
-                            <div id="kc-info" className={cx(props.kcSignUpClass)}>
-                                <div id="kc-info-wrapper" className={cx(props.kcInfoAreaWrapperClass)}>
+                            <div id="kc-info" className={clsx(props.kcSignUpClass)}>
+                                <div id="kc-info-wrapper" className={clsx(props.kcInfoAreaWrapperClass)}>
                                     {infoNode}
                                 </div>
                             </div>

package/src/lib/components/Terms.tsx

@@ -3,7 +3,7 @@ import DefaultTemplate from "./Template";
 import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useCssAndCx } from "../tools/useCssAndCx";
+import { clsx } from "../tools/clsx";
 import { Evt } from "evt";
 import { useRerenderOnStateChange } from "evt/hooks";
 import { assert } from "tsafe/assert";
@@ -70,8 +70,6 @@ const Terms = memo((props: TermsProps) => {
 
     useRerenderOnStateChange(evtTermMarkdown);
 
-    const { cx } = useCssAndCx();
-
     const { url } = kcContext;
 
     if (evtTermMarkdown.state === undefined) {
@@ -88,7 +86,7 @@ const Terms = memo((props: TermsProps) => {
                     <div id="kc-terms-text">{evtTermMarkdown.state && <Markdown>{evtTermMarkdown.state}</Markdown>}</div>
                     <form className="form-actions" action={url.loginAction} method="POST">
                         <input
-                            className={cx(
+                            className={clsx(
                                 kcProps.kcButtonClass,
                                 kcProps.kcButtonClass,
                                 kcProps.kcButtonClass,
@@ -101,7 +99,7 @@ const Terms = memo((props: TermsProps) => {
                             value={msgStr("doAccept")}
                         />
                         <input
-                            className={cx(kcProps.kcButtonClass, kcProps.kcButtonDefaultClass, kcProps.kcButtonLargeClass)}
+                            className={clsx(kcProps.kcButtonClass, kcProps.kcButtonDefaultClass, kcProps.kcButtonLargeClass)}
                             name="cancel"
                             id="kc-decline"
                             type="submit"

package/src/lib/components/UpdateUserProfile.tsx

@@ -3,7 +3,7 @@ import DefaultTemplate from "./Template";
 import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useCssAndCx } from "../tools/useCssAndCx";
+import { clsx } from "../tools/clsx";
 import type { I18n } from "../i18n";
 import { UserProfileFormFields } from "./shared/UserProfileCommons";
 
@@ -17,8 +17,6 @@ export type UpdateUserProfileProps = KcProps & {
 const UpdateUserProfile = memo((props: UpdateUserProfileProps) => {
     const { kcContext, i18n, doFetchDefaultThemeResources = true, Template = DefaultTemplate, ...kcProps } = props;
 
-    const { cx } = useCssAndCx();
-
     const { msg, msgStr } = i18n;
 
     const { url, isAppInitiatedAction } = kcContext;
@@ -30,24 +28,24 @@ const UpdateUserProfile = memo((props: UpdateUserProfileProps) => {
             {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             headerNode={msg("loginProfileTitle")}
             formNode={
-                <form id="kc-update-profile-form" className={cx(kcProps.kcFormClass)} action={url.loginAction} method="post">
+                <form id="kc-update-profile-form" className={clsx(kcProps.kcFormClass)} action={url.loginAction} method="post">
                     <UserProfileFormFields kcContext={kcContext} onIsFormSubmittableValueChange={setIsFomSubmittable} i18n={i18n} {...kcProps} />
 
-                    <div className={cx(kcProps.kcFormGroupClass)}>
-                        <div id="kc-form-options" className={cx(kcProps.kcFormOptionsClass)}>
-                            <div className={cx(kcProps.kcFormOptionsWrapperClass)}></div>
+                    <div className={clsx(kcProps.kcFormGroupClass)}>
+                        <div id="kc-form-options" className={clsx(kcProps.kcFormOptionsClass)}>
+                            <div className={clsx(kcProps.kcFormOptionsWrapperClass)}></div>
                         </div>
 
-                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
+                        <div id="kc-form-buttons" className={clsx(kcProps.kcFormButtonsClass)}>
                             {isAppInitiatedAction ? (
                                 <>
                                     <input
-                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonPrimaryClass, kcProps.kcButtonLargeClass)}
+                                        className={clsx(kcProps.kcButtonClass, kcProps.kcButtonPrimaryClass, kcProps.kcButtonLargeClass)}
                                         type="submit"
                                         value={msgStr("doSubmit")}
                                     />
                                     <button
-                                        className={cx(kcProps.kcButtonClass, kcProps.kcButtonDefaultClass, kcProps.kcButtonLargeClass)}
+                                        className={clsx(kcProps.kcButtonClass, kcProps.kcButtonDefaultClass, kcProps.kcButtonLargeClass)}
                                         type="submit"
                                         name="cancel-aia"
                                         value="true"
@@ -58,7 +56,7 @@ const UpdateUserProfile = memo((props: UpdateUserProfileProps) => {
                                 </>
                             ) : (
                                 <input
-                                    className={cx(
+                                    className={clsx(
                                         kcProps.kcButtonClass,
                                         kcProps.kcButtonPrimaryClass,
                                         kcProps.kcButtonBlockClass,

package/src/lib/components/WebauthnAuthenticate.tsx

@@ -3,7 +3,7 @@ import DefaultTemplate from "./Template";
 import type { TemplateProps } from "./Template";
 import type { KcProps } from "./KcProps";
 import type { KcContextBase } from "../getKcContext/KcContextBase";
-import { useCssAndCx } from "../tools/useCssAndCx";
+import { clsx } from "../tools/clsx";
 import type { I18n, MessageKeyBase } from "../i18n";
 import { base64url } from "rfc4648";
 import { useConstCallback } from "powerhooks/useConstCallback";
@@ -26,8 +26,6 @@ const WebauthnAuthenticate = memo((props: WebauthnAuthenticateProps) => {
     const createTimeout = Number(kcContext.createTimeout);
     const isUserIdentified = kcContext.isUserIdentified == "true";
 
-    const { cx } = useCssAndCx();
-
     const webAuthnAuthenticate = useConstCallback(async () => {
         if (!isUserIdentified) {
             return;
@@ -102,7 +100,7 @@ const WebauthnAuthenticate = memo((props: WebauthnAuthenticateProps) => {
             {...{ kcContext, i18n, doFetchDefaultThemeResources, ...kcProps }}
             headerNode={msg("webauthn-login-title")}
             formNode={
-                <div id="kc-form-webauthn" className={cx(kcProps.kcFormClass)}>
+                <div id="kc-form-webauthn" className={clsx(kcProps.kcFormClass)}>
                     <form id="webauth" action={url.loginAction} ref={webAuthForm} method="post">
                         <input type="hidden" id="clientDataJSON" name="clientDataJSON" value={clientDataJSON} />
                         <input type="hidden" id="authenticatorData" name="authenticatorData" value={authenticatorData} />
@@ -111,10 +109,10 @@ const WebauthnAuthenticate = memo((props: WebauthnAuthenticateProps) => {
                         <input type="hidden" id="userHandle" name="userHandle" value={userHandle} />
                         <input type="hidden" id="error" name="error" value={error} />
                     </form>
-                    <div className={cx(kcProps.kcFormGroupClass)}>
+                    <div className={clsx(kcProps.kcFormGroupClass)}>
                         {authenticators &&
                             (() => (
-                                <form id="authn_select" className={cx(kcProps.kcFormClass)}>
+                                <form id="authn_select" className={clsx(kcProps.kcFormClass)}>
                                     {authenticators.authenticators.map(authenticator => (
                                         <input
                                             type="hidden"
@@ -130,23 +128,23 @@ const WebauthnAuthenticate = memo((props: WebauthnAuthenticateProps) => {
                             (() => (
                                 <>
                                     {authenticators.authenticators.length > 1 && (
-                                        <p className={cx(kcProps.kcSelectAuthListItemTitle)}>{msg("webauthn-available-authenticators")}</p>
+                                        <p className={clsx(kcProps.kcSelectAuthListItemTitle)}>{msg("webauthn-available-authenticators")}</p>
                                     )}
-                                    <div className={cx(kcProps.kcFormClass)}>
+                                    <div className={clsx(kcProps.kcFormClass)}>
                                         {authenticators.authenticators.map(authenticator => (
-                                            <div id="kc-webauthn-authenticator" className={cx(kcProps.kcSelectAuthListItemClass)}>
-                                                <div className={cx(kcProps.kcSelectAuthListItemIconClass)}>
+                                            <div id="kc-webauthn-authenticator" className={clsx(kcProps.kcSelectAuthListItemClass)}>
+                                                <div className={clsx(kcProps.kcSelectAuthListItemIconClass)}>
                                                     <i
-                                                        className={cx(
+                                                        className={clsx(
                                                             kcProps[authenticator.transports.iconClass] ?? kcProps.kcWebAuthnDefaultIcon,
                                                             kcProps.kcSelectAuthListItemIconPropertyClass
                                                         )}
                                                     />
                                                 </div>
-                                                <div className={cx(kcProps.kcSelectAuthListItemBodyClass)}>
+                                                <div className={clsx(kcProps.kcSelectAuthListItemBodyClass)}>
                                                     <div
                                                         id="kc-webauthn-authenticator-label"
-                                                        className={cx(kcProps.kcSelectAuthListItemHeadingClass)}
+                                                        className={clsx(kcProps.kcSelectAuthListItemHeadingClass)}
                                                     >
                                                         {authenticator.label}
                                                     </div>
@@ -154,7 +152,7 @@ const WebauthnAuthenticate = memo((props: WebauthnAuthenticateProps) => {
                                                     {authenticator.transports && authenticator.transports.displayNameProperties.length && (
                                                         <div
                                                             id="kc-webauthn-authenticator-transport"
-                                                            className={cx(kcProps.kcSelectAuthListItemDescriptionClass)}
+                                                            className={clsx(kcProps.kcSelectAuthListItemDescriptionClass)}
                                                         >
                                                             {authenticator.transports.displayNameProperties.map(
                                                                 (transport: MessageKeyBase, index: number) => (
@@ -169,25 +167,25 @@ const WebauthnAuthenticate = memo((props: WebauthnAuthenticateProps) => {
                                                         </div>
                                                     )}
 
-                                                    <div className={cx(kcProps.kcSelectAuthListItemDescriptionClass)}>
+                                                    <div className={clsx(kcProps.kcSelectAuthListItemDescriptionClass)}>
                                                         <span id="kc-webauthn-authenticator-created-label">{msg("webauthn-createdAt-label")}</span>
                                                         <span id="kc-webauthn-authenticator-created">{authenticator.createdAt}</span>
                                                     </div>
                                                 </div>
-                                                <div className={cx(kcProps.kcSelectAuthListItemFillClass)} />
+                                                <div className={clsx(kcProps.kcSelectAuthListItemFillClass)} />
                                             </div>
                                         ))}
                                     </div>
                                 </>
                             ))()}
-                        <div id="kc-form-buttons" className={cx(kcProps.kcFormButtonsClass)}>
+                        <div id="kc-form-buttons" className={clsx(kcProps.kcFormButtonsClass)}>
                             <input
                                 id="authenticateWebAuthnButton"
                                 type="button"
                                 onClick={webAuthnAuthenticate}
                                 autoFocus={true}
                                 value={msgStr("webauthn-doAuthenticate")}
-                                className={cx(
+                                className={clsx(
                                     kcProps.kcButtonClass,
                                     kcProps.kcButtonPrimaryClass,
                                     kcProps.kcButtonBlockClass,

package/src/lib/components/shared/UserProfileCommons.tsx

@@ -1,7 +1,7 @@
 import React, { memo, useEffect, Fragment } from "react";
 import type { KcProps } from "../KcProps";
 import type { Attribute } from "../../getKcContext/KcContextBase";
-import { useCssAndCx } from "../../tools/useCssAndCx";
+import { clsx } from "../../tools/clsx";
 import type { ReactComponent } from "../../tools/ReactComponent";
 import { useCallbackFactory } from "powerhooks/useCallbackFactory";
 import { useFormValidationSlice } from "../../useFormValidationSlice";
@@ -18,8 +18,6 @@ export type UserProfileFormFieldsProps = {
 
 export const UserProfileFormFields = memo(
     ({ kcContext, onIsFormSubmittableValueChange, i18n, BeforeField, AfterField, ...props }: UserProfileFormFieldsProps) => {
-        const { cx, css } = useCssAndCx();
-
         const { advancedMsg } = i18n;
 
         const {
@@ -67,20 +65,20 @@ export const UserProfileFormFields = memo(
 
                     const { value, displayableErrors } = fieldStateByAttributeName[attribute.name];
 
-                    const formGroupClassName = cx(props.kcFormGroupClass, displayableErrors.length !== 0 && props.kcFormGroupErrorClass);
+                    const formGroupClassName = clsx(props.kcFormGroupClass, displayableErrors.length !== 0 && props.kcFormGroupErrorClass);
 
                     return (
                         <Fragment key={i}>
                             {group !== currentGroup && (currentGroup = group) !== "" && (
                                 <div className={formGroupClassName}>
-                                    <div className={cx(props.kcContentWrapperClass)}>
-                                        <label id={`header-${group}`} className={cx(props.kcFormGroupHeader)}>
+                                    <div className={clsx(props.kcContentWrapperClass)}>
+                                        <label id={`header-${group}`} className={clsx(props.kcFormGroupHeader)}>
                                             {advancedMsg(groupDisplayHeader) || currentGroup}
                                         </label>
                                     </div>
                                     {groupDisplayDescription !== "" && (
-                                        <div className={cx(props.kcLabelWrapperClass)}>
-                                            <label id={`description-${group}`} className={`${cx(props.kcLabelClass)}`}>
+                                        <div className={clsx(props.kcLabelWrapperClass)}>
+                                            <label id={`description-${group}`} className={`${clsx(props.kcLabelClass)}`}>
                                                 {advancedMsg(groupDisplayDescription)}
                                             </label>
                                         </div>
@@ -91,13 +89,13 @@ export const UserProfileFormFields = memo(
                             {BeforeField && <BeforeField attribute={attribute} />}
 
                             <div className={formGroupClassName}>
-                                <div className={cx(props.kcLabelWrapperClass)}>
-                                    <label htmlFor={attribute.name} className={cx(props.kcLabelClass)}>
+                                <div className={clsx(props.kcLabelWrapperClass)}>
+                                    <label htmlFor={attribute.name} className={clsx(props.kcLabelClass)}>
                                         {advancedMsg(attribute.displayName ?? "")}
                                     </label>
                                     {attribute.required && <>*</>}
                                 </div>
-                                <div className={cx(props.kcInputWrapperClass)}>
+                                <div className={clsx(props.kcInputWrapperClass)}>
                                     {(() => {
                                         const { options } = attribute.validators;
 
@@ -134,7 +132,7 @@ export const UserProfileFormFields = memo(
                                                 name={attribute.name}
                                                 value={value}
                                                 onChange={onChangeFactory(attribute.name)}
-                                                className={cx(props.kcInputClass)}
+                                                className={clsx(props.kcInputClass)}
                                                 aria-invalid={displayableErrors.length !== 0}
                                                 disabled={attribute.readOnly}
                                                 autoComplete={attribute.autocomplete}
@@ -142,21 +140,26 @@ export const UserProfileFormFields = memo(
                                             />
                                         );
                                     })()}
-                                    {displayableErrors.length !== 0 && (
-                                        <span
-                                            id={`input-error-${attribute.name}`}
-                                            className={cx(
-                                                props.kcInputErrorMessageClass,
-                                                css({
-                                                    "position": displayableErrors.length === 1 ? "absolute" : undefined,
-                                                    "& > span": { "display": "block" }
-                                                })
-                                            )}
-                                            aria-live="polite"
-                                        >
-                                            {displayableErrors.map(({ errorMessage }) => errorMessage)}
-                                        </span>
-                                    )}
+                                    {displayableErrors.length !== 0 &&
+                                        (() => {
+                                            const divId = `input-error-${attribute.name}`;
+
+                                            return (
+                                                <>
+                                                    <style>{`#${divId} > span: { display: block; }`}</style>
+                                                    <span
+                                                        id={divId}
+                                                        className={clsx(props.kcInputErrorMessageClass)}
+                                                        style={{
+                                                            "position": displayableErrors.length === 1 ? "absolute" : undefined
+                                                        }}
+                                                        aria-live="polite"
+                                                    >
+                                                        {displayableErrors.map(({ errorMessage }) => errorMessage)}
+                                                    </span>
+                                                </>
+                                            );
+                                        })()}
                                 </div>
                             </div>
 

package/src/lib/tools/clsx.ts

@@ -0,0 +1,7 @@
+import { classnames } from "tss-react/tools/classnames";
+import type { Cx } from "tss-react";
+
+/** Drop in replacement for https://www.npmjs.com/package/clsx */
+export const clsx: Cx = (...args) => {
+    return classnames(args);
+};

package/src/lib/tools/useCssAndCx.ts

@@ -1,11 +1,12 @@
-import { createMakeStyles } from "tss-react";
-
-const { useStyles } = createMakeStyles({
-    "useTheme": () => ({})
-});
+import { clsx as cx } from "./clsx";
 
+/**
+ * @deprecated: Use clsx instead.
+ * import { clsx } from "keycloakify/lib/tools/clsx";
+ * You can use clsx as cx.
+ * If you where using the css() function you can import
+ * it from @emotion/css: https://emotion.sh/docs/@emotion/css
+ */
 export function useCssAndCx() {
-    const { css, cx } = useStyles();
-
-    return { css, cx };
+    return { cx };
 }