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.

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

Fix #6079: useStyle better handling of undefined ID #6090

Merged
merged 1 commit into from
Mar 18, 2024
Merged

Fix #6079: useStyle better handling of undefined ID #6090

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
27 changes: 23 additions & 4 deletions components/lib/hooks/useStyle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,25 @@ export const useStyle = (css, options = {}) => {
const defaultDocument = DomHandler.isClient() ? window.document : undefined;
const { document = defaultDocument, manual = false, name = `style_${++_id}`, id = undefined, media = undefined } = options;

const getCurrentStyleRef = (styleContainer) => {
const existingStyle = styleContainer.querySelector(`style[data-primereact-style-id="${name}"]`);

if (existingStyle) {
return existingStyle;
}

if (id !== undefined) {
const existingElement = document.getElementById(id);

if (existingElement) {
return existingElement;
}
}

// finally if not found create the new style
return document.createElement('style');
};

const update = (newCSS) => {
isLoaded && css !== newCSS && (styleRef.current.textContent = newCSS);
};
Expand All @@ -21,16 +40,16 @@ export const useStyle = (css, options = {}) => {

const styleContainer = context?.styleContainer || document.head;

styleRef.current = styleContainer.querySelector(`style[data-primereact-style-id="${name}"]`) || document.getElementById(id) || document.createElement('style');
styleRef.current = getCurrentStyleRef(styleContainer);

if (!styleRef.current.isConnected) {
styleRef.current.type = 'text/css';
id && (styleRef.current.id = id);
media && (styleRef.current.media = media);
if (id) styleRef.current.id = id;
if (media) styleRef.current.media = media;

DomHandler.addNonce(styleRef.current, (context && context.nonce) || PrimeReact.nonce);
styleContainer.appendChild(styleRef.current);
name && styleRef.current.setAttribute('data-primereact-style-id', name);
if (name) styleRef.current.setAttribute('data-primereact-style-id', name);
}

styleRef.current.textContent = css;
Expand Down
Loading