Skip to content

feat: custom elements support #8253

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

Open
alexisreina wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −10
Open

feat: custom elements support #8253

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion packages/core/src/basecomponent/BaseComponent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ export default {
return { classes: undefined, inlineStyles: undefined, load: () => {}, loadCSS: () => {}, loadStyle: () => {}, ...(this._getHostInstance(this) || {}).$style, ...this.$options.style };
},
$styleOptions() {
return { nonce: this.$primevueConfig?.csp?.nonce };
return { nonce: this.$primevueConfig?.csp?.nonce, styleContainer: this.$primevueConfig?.styleContainer };
},
$primevueConfig() {
return this.$primevue?.config;
Expand Down
9 changes: 5 additions & 4 deletions packages/core/src/basedirective/BaseDirective.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,15 @@ const BaseDirective = {
_loadStyles: (instance = {}, binding, vnode) => {
const config = BaseDirective._getConfig(binding, vnode);
const useStyleOptions = { nonce: config?.csp?.nonce };
const styleContainer = config?.styleContainer;

BaseDirective._loadCoreStyles(instance, useStyleOptions);
BaseDirective._loadThemeStyles(instance, useStyleOptions);
BaseDirective._loadScopedThemeStyles(instance, useStyleOptions);
BaseDirective._loadCoreStyles(instance, { ...useStyleOptions, styleContainer });
BaseDirective._loadThemeStyles(instance, { ...useStyleOptions, styleContainer });
BaseDirective._loadScopedThemeStyles(instance, { ...useStyleOptions, styleContainer });

BaseDirective._removeThemeListeners(instance);

instance.$loadStyles = () => BaseDirective._loadThemeStyles(instance, useStyleOptions);
instance.$loadStyles = () => BaseDirective._loadThemeStyles(instance, { ...useStyleOptions, styleContainer });

BaseDirective._themeChangeListener(instance.$loadStyles);
},
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/config/PrimeVue.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export interface PrimeVueConfiguration {
*/
inputStyle?: 'filled' | 'outlined' | undefined;
inputVariant?: 'filled' | 'outlined' | undefined;
styleContainer?: HTMLElement | ShadowRoot;
locale?: PrimeVueLocaleOptions;
filterMatchModeOptions?: any;
zIndex?: PrimeVueZIndexOptions;
Expand Down
3 changes: 2 additions & 1 deletion packages/core/src/config/PrimeVue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export const defaultOptions = {
ripple: false,
inputStyle: null,
inputVariant: null,
styleContainer: undefined,
locale: {
startsWith: 'Starts with',
contains: 'Contains',
Expand Down Expand Up @@ -198,7 +199,7 @@ export function setupConfig(app, PrimeVue) {
// common
if (!Theme.isStyleNameLoaded('common')) {
const { primitive, semantic, global, style } = BaseStyle.getCommonTheme?.() || {};
const styleOptions = { nonce: PrimeVue.config?.csp?.nonce };
const styleOptions = { nonce: PrimeVue.config?.csp?.nonce, styleContainer: PrimeVue.config?.styleContainer };

BaseStyle.load(primitive?.css, { name: 'primitive-variables', ...styleOptions });
BaseStyle.load(semantic?.css, { name: 'semantic-variables', ...styleOptions });
Expand Down
1 change: 1 addition & 0 deletions packages/core/src/usestyle/UseStyle.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export interface StyleOptions {
media?: string;
nonce?: string;
props?: any;
styleContainer?: HTMLElement | ShadowRoot;
}

export interface Style {
Expand Down
10 changes: 6 additions & 4 deletions packages/core/src/usestyle/UseStyle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export function useStyle(css, options = {}) {
const isLoaded = ref(false);
const cssRef = ref(css);
const styleRef = ref(null);
let injectTarget = null;

const defaultDocument = isClient() ? window.document : undefined;
const {
Expand All @@ -31,6 +32,7 @@ export function useStyle(css, options = {}) {
onMounted: onStyleMounted = undefined,
onUpdated: onStyleUpdated = undefined,
onLoad: onStyleLoaded = undefined,
styleContainer = undefined,
props = {}
} = options;

Expand All @@ -39,11 +41,11 @@ export function useStyle(css, options = {}) {
/* @todo: Improve _options params */
const load = (_css, _props = {}) => {
if (!document) return;

injectTarget = styleContainer || document.head;
const _styleProps = { ...props, ..._props };
const [_name, _id, _nonce] = [_styleProps.name || name, _styleProps.id || id, _styleProps.nonce || nonce];

styleRef.value = document.querySelector(`style[data-primevue-style-id="${_name}"]`) || document.getElementById(_id) || document.createElement('style');
styleRef.value = injectTarget.querySelector(`style[data-primevue-style-id="${_name}"]`) || (_id ? injectTarget.querySelector(`#${_id}`) : null) || document.createElement('style');

if (!styleRef.value.isConnected) {
cssRef.value = _css || css;
Expand All @@ -54,7 +56,7 @@ export function useStyle(css, options = {}) {
media,
nonce: _nonce
});
first ? document.head.prepend(styleRef.value) : document.head.appendChild(styleRef.value);
first ? injectTarget.prepend(styleRef.value) : injectTarget.appendChild(styleRef.value);
setAttribute(styleRef.value, 'data-primevue-style-id', _name);
setAttributes(styleRef.value, _styleProps);
styleRef.value.onload = (event) => onStyleLoaded?.(event, { name: _name });
Expand All @@ -78,7 +80,7 @@ export function useStyle(css, options = {}) {
const unload = () => {
if (!document || !isLoaded.value) return;
stop();
isExist(styleRef.value) && document.head.removeChild(styleRef.value);
isExist(styleRef.value) && injectTarget.removeChild(styleRef.value);
isLoaded.value = false;
styleRef.value = null;
};
Expand Down