-
-
-
- {{ getItemLabel(processedItem) }}
+
+
+
+ {{ getItemLabel(processedItem) }}
-
-
-
- {{ getItemLabel(processedItem) }}
+
+
+
+ {{ getItemLabel(processedItem) }}
-
-
+
+
@@ -45,7 +45,7 @@
v-if="isItemVisible(processedItem) && isItemGroup(processedItem)"
:id="getItemId(processedItem) + '_list'"
role="menu"
- :class="getCXOptions('submenu')"
+ :class="cx('submenu')"
:menuId="menuId"
:focusedItemId="focusedItemId"
:items="processedItem.items"
@@ -64,7 +64,7 @@
v-if="isItemVisible(processedItem) && getItemProp(processedItem, 'separator')"
:id="getItemId(processedItem)"
:style="getItemProp(processedItem, 'style')"
- :class="[getCXOptions('separator'), getItemProp(processedItem, 'class')]"
+ :class="[cx('separator'), getItemProp(processedItem, 'class')]"
role="separator"
v-bind="ptm('separator')"
>
@@ -74,14 +74,14 @@
diff --git a/components/lib/inputnumber/BaseInputNumber.vue b/components/lib/inputnumber/BaseInputNumber.vue
index f16bbb392..2ea01ddf0 100644
--- a/components/lib/inputnumber/BaseInputNumber.vue
+++ b/components/lib/inputnumber/BaseInputNumber.vue
@@ -132,7 +132,7 @@ const classes = {
]
};
-const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_inputnumber_style', manual: true });
+const { load: loadStyle } = useStyle(styles, { id: 'primevue_inputnumber_style', manual: true });
export default {
name: 'BaseInputNumber',
@@ -276,15 +276,13 @@ export default {
}
},
css: {
- classes
+ classes,
+ loadStyle
},
- watch: {
- isUnstyled: {
- immediate: true,
- handler(newValue) {
- !newValue && loadStyle();
- }
- }
+ provide() {
+ return {
+ $parentInstance: this
+ };
}
};
diff --git a/components/lib/inputswitch/BaseInputSwitch.vue b/components/lib/inputswitch/BaseInputSwitch.vue
index ca7ee7e64..a78a88906 100644
--- a/components/lib/inputswitch/BaseInputSwitch.vue
+++ b/components/lib/inputswitch/BaseInputSwitch.vue
@@ -41,7 +41,7 @@ const classes = {
slider: 'p-inputswitch-slider'
};
-const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_inputswitch_style', manual: true });
+const { load: loadStyle } = useStyle(styles, { id: 'primevue_inputswitch_style', manual: true });
export default {
name: 'BaseInputSwitch',
@@ -90,15 +90,13 @@ export default {
},
css: {
classes,
- inlineStyles
+ inlineStyles,
+ loadStyle
},
- watch: {
- isUnstyled: {
- immediate: true,
- handler(newValue) {
- !newValue && loadStyle();
- }
- }
+ provide() {
+ return {
+ $parentInstance: this
+ };
}
};
diff --git a/components/lib/inputtext/BaseInputText.vue b/components/lib/inputtext/BaseInputText.vue
index edce7469d..b23b1f2be 100644
--- a/components/lib/inputtext/BaseInputText.vue
+++ b/components/lib/inputtext/BaseInputText.vue
@@ -116,7 +116,7 @@ const classes = {
root: ({ instance }) => ['p-inputtext p-component', { 'p-filled': instance.filled }]
};
-const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_inputtext_style', manual: true });
+const { load: loadStyle } = useStyle(styles, { id: 'primevue_inputtext_style', manual: true });
export default {
name: 'BaseInputText',
@@ -125,15 +125,13 @@ export default {
modelValue: null
},
css: {
- classes
+ classes,
+ loadStyle
},
- watch: {
- isUnstyled: {
- immediate: true,
- handler(newValue) {
- !newValue && loadStyle();
- }
- }
+ provide() {
+ return {
+ $parentInstance: this
+ };
}
};
diff --git a/components/lib/knob/BaseKnob.vue b/components/lib/knob/BaseKnob.vue
index 7c0ab9b33..2a70e2e0c 100644
--- a/components/lib/knob/BaseKnob.vue
+++ b/components/lib/knob/BaseKnob.vue
@@ -30,7 +30,7 @@ const classes = {
label: 'p-knob-text'
};
-const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_knob_style', manual: true });
+const { load: loadStyle } = useStyle(styles, { id: 'primevue_knob_style', manual: true });
export default {
name: 'BaseKnob',
@@ -102,15 +102,13 @@ export default {
}
},
css: {
- classes
+ classes,
+ loadStyle
},
- watch: {
- isUnstyled: {
- immediate: true,
- handler(newValue) {
- !newValue && loadStyle();
- }
- }
+ provide() {
+ return {
+ $parentInstance: this
+ };
}
};
diff --git a/components/lib/listbox/BaseListbox.vue b/components/lib/listbox/BaseListbox.vue
index f9f0524e2..e033c6657 100644
--- a/components/lib/listbox/BaseListbox.vue
+++ b/components/lib/listbox/BaseListbox.vue
@@ -69,7 +69,7 @@ const classes = {
hiddenLastFocusableEl: 'p-hidden-accessible p-hidden-focusable'
};
-const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_listbox_style', manual: true });
+const { load: loadStyle } = useStyle(styles, { id: 'primevue_listbox_style', manual: true });
export default {
name: 'BaseListbox',
@@ -149,15 +149,13 @@ export default {
}
},
css: {
- classes
+ classes,
+ loadStyle
},
- watch: {
- isUnstyled: {
- immediate: true,
- handler(newValue) {
- !newValue && loadStyle();
- }
- }
+ provide() {
+ return {
+ $parentInstance: this
+ };
}
};
diff --git a/components/lib/megamenu/BaseMegaMenu.vue b/components/lib/megamenu/BaseMegaMenu.vue
index ffcaf69db..fc956baba 100644
--- a/components/lib/megamenu/BaseMegaMenu.vue
+++ b/components/lib/megamenu/BaseMegaMenu.vue
@@ -116,7 +116,7 @@ const styles = `
`;
const inlineStyles = {
- submenu: ({ context, processedItem }) => ({ display: context.isItemActive(processedItem) ? 'block' : 'none' })
+ submenu: ({ instance, processedItem }) => ({ display: instance.isItemActive(processedItem) ? 'block' : 'none' })
};
const classes = {
@@ -129,26 +129,26 @@ const classes = {
],
start: 'p-megamenu-start',
menu: 'p-megamenu-root-list',
- submenuHeader: ({ context, processedItem }) => [
+ submenuHeader: ({ instance, processedItem }) => [
'p-megamenu-submenu-header p-submenu-header',
{
- 'p-disabled': context.isItemDisabled(processedItem)
+ 'p-disabled': instance.isItemDisabled(processedItem)
}
],
- menuitem: ({ context, processedItem }) => [
+ menuitem: ({ instance, processedItem }) => [
'p-menuitem',
{
- 'p-menuitem-active p-highlight': context.isItemActive(processedItem),
- 'p-focus': context.isItemFocused(processedItem),
- 'p-disabled': context.isItemDisabled(processedItem)
+ 'p-menuitem-active p-highlight': instance.isItemActive(processedItem),
+ 'p-focus': instance.isItemFocused(processedItem),
+ 'p-disabled': instance.isItemDisabled(processedItem)
}
],
content: 'p-menuitem-content',
- action: ({ context, isActive, isExactActive }) => [
+ action: ({ instance, isActive, isExactActive }) => [
'p-menuitem-link',
{
'router-link-active': isActive,
- 'router-link-active-exact': context.exact && isExactActive
+ 'router-link-active-exact': instance.exact && isExactActive
}
],
icon: 'p-menuitem-icon',
@@ -156,8 +156,8 @@ const classes = {
submenuIcon: 'p-submenu-icon',
panel: 'p-megamenu-panel',
grid: 'p-megamenu-grid',
- column: ({ context, processedItem }) => {
- let length = context.isItemGroup(processedItem) ? processedItem.items.length : 0;
+ column: ({ instance, processedItem }) => {
+ let length = instance.isItemGroup(processedItem) ? processedItem.items.length : 0;
let columnClass;
switch (length) {
@@ -189,7 +189,7 @@ const classes = {
end: 'p-megamenu-end'
};
-const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_megamenu_style', manual: true });
+const { load: loadStyle } = useStyle(styles, { id: 'primevue_megamenu_style', manual: true });
export default {
name: 'BaseMegaMenu',
@@ -226,15 +226,13 @@ export default {
},
css: {
classes,
- inlineStyles
+ inlineStyles,
+ loadStyle
},
- watch: {
- isUnstyled: {
- immediate: true,
- handler(newValue) {
- !newValue && loadStyle();
- }
- }
+ provide() {
+ return {
+ $parentInstance: this
+ };
}
};
diff --git a/components/lib/megamenu/MegaMenuSub.vue b/components/lib/megamenu/MegaMenuSub.vue
index 21868e3e2..6e2898457 100644
--- a/components/lib/megamenu/MegaMenuSub.vue
+++ b/components/lib/megamenu/MegaMenuSub.vue
@@ -1,12 +1,12 @@
-
- - {{ getItemLabel(submenu) }}
+
+ - {{ getItemLabel(submenu) }}
-
-
+
-
-
-
+
+
+
diff --git a/components/lib/menu/Menuitem.vue b/components/lib/menu/Menuitem.vue
index 9bd715539..f8842586d 100644
--- a/components/lib/menu/Menuitem.vue
+++ b/components/lib/menu/Menuitem.vue
@@ -2,7 +2,7 @@
-
-
+
-
-
-
- {{ label() }}
+
+
+
+ {{ label() }}
-
-
-
- {{ label() }}
+
+
+
+ {{ label() }}
@@ -32,13 +32,13 @@
diff --git a/components/lib/menubar/MenubarSub.vue b/components/lib/menubar/MenubarSub.vue
index 526c5dafd..331f002ec 100755
--- a/components/lib/menubar/MenubarSub.vue
+++ b/components/lib/menubar/MenubarSub.vue
@@ -1,11 +1,11 @@
-
+
-
-
+
-
-
-
- {{ getItemLabel(processedItem) }}
+
+
+
+ {{ getItemLabel(processedItem) }}
-
-
-
- {{ getItemLabel(processedItem) }}
+
+
+
+ {{ getItemLabel(processedItem) }}
-
-
+
+
@@ -44,7 +44,7 @@
v-if="isItemVisible(processedItem) && isItemGroup(processedItem)"
:menuId="menuId"
role="menu"
- :style="getSXOptions('submenu', { processedItem })"
+ :style="sx('submenu', true, { processedItem })"
:focusedItemId="focusedItemId"
:items="processedItem.items"
:mobileActive="mobileActive"
@@ -60,7 +60,7 @@
-
diff --git a/components/lib/panelmenu/BasePanelMenu.vue b/components/lib/panelmenu/BasePanelMenu.vue
index 7695c9a84..e160fcc68 100644
--- a/components/lib/panelmenu/BasePanelMenu.vue
+++ b/components/lib/panelmenu/BasePanelMenu.vue
@@ -60,19 +60,19 @@ const classes = {
toggleableContent: 'p-toggleable-content',
menuContent: 'p-panelmenu-content',
menu: 'p-panelmenu-root-list',
- menuitem: ({ context, processedItem }) => [
+ menuitem: ({ instance, processedItem }) => [
'p-menuitem',
{
- 'p-focus': context.isItemFocused(processedItem),
- 'p-disabled': context.isItemDisabled(processedItem)
+ 'p-focus': instance.isItemFocused(processedItem),
+ 'p-disabled': instance.isItemDisabled(processedItem)
}
],
content: 'p-menuitem-content',
- action: ({ context, isActive, isExactActive }) => [
+ action: ({ instance, isActive, isExactActive }) => [
'p-menuitem-link',
{
'router-link-active': isActive,
- 'router-link-active-exact': context.exact && isExactActive
+ 'router-link-active-exact': instance.exact && isExactActive
}
],
icon: 'p-menuitem-icon',
@@ -82,7 +82,7 @@ const classes = {
separator: 'p-menuitem-separator'
};
-const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_panelmenu_style', manual: true });
+const { load: loadStyle } = useStyle(styles, { id: 'primevue_panelmenu_style', manual: true });
export default {
name: 'BasePanelMenu',
@@ -106,15 +106,13 @@ export default {
}
},
css: {
- classes
+ classes,
+ loadStyle
},
- watch: {
- isUnstyled: {
- immediate: true,
- handler(newValue) {
- !newValue && loadStyle();
- }
- }
+ provide() {
+ return {
+ $parentInstance: this
+ };
}
};
diff --git a/components/lib/panelmenu/PanelMenuList.vue b/components/lib/panelmenu/PanelMenuList.vue
index 90d58180b..f68315812 100644
--- a/components/lib/panelmenu/PanelMenuList.vue
+++ b/components/lib/panelmenu/PanelMenuList.vue
@@ -1,7 +1,7 @@
diff --git a/components/lib/splitter/BaseSplitter.vue b/components/lib/splitter/BaseSplitter.vue
index 23ae66e6b..c64bf6fc3 100644
--- a/components/lib/splitter/BaseSplitter.vue
+++ b/components/lib/splitter/BaseSplitter.vue
@@ -60,7 +60,7 @@ const inlineStyles = {
root: ({ props }) => [{ display: 'flex', 'flex-wrap': 'nowrap' }, props.layout === 'vertical' ? { 'flex-direction': 'column' } : '']
};
-const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_splitter_style', manual: true });
+const { load: loadStyle } = useStyle(styles, { id: 'primevue_splitter_style', manual: true });
export default {
name: 'BaseSplitter',
@@ -89,15 +89,13 @@ export default {
},
css: {
classes,
- inlineStyles
+ inlineStyles,
+ loadStyle
},
- watch: {
- isUnstyled: {
- immediate: true,
- handler(newValue) {
- !newValue && loadStyle();
- }
- }
+ provide() {
+ return {
+ $parentInstance: this
+ };
}
};
diff --git a/components/lib/splitterpanel/BaseSplitterPanel.vue b/components/lib/splitterpanel/BaseSplitterPanel.vue
index a263b579d..3bc9f1ff1 100644
--- a/components/lib/splitterpanel/BaseSplitterPanel.vue
+++ b/components/lib/splitterpanel/BaseSplitterPanel.vue
@@ -21,7 +21,7 @@ const classes = {
root: ({ instance }) => ['p-splitter-panel', { 'p-splitter-panel-nested': instance.isNested }]
};
-const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_splitterpanel_style', manual: true });
+const { load: loadStyle } = useStyle(styles, { id: 'primevue_splitterpanel_style', manual: true });
export default {
name: 'BaseSplitterPanel',
@@ -37,15 +37,13 @@ export default {
}
},
css: {
- classes
+ classes,
+ loadStyle
},
- watch: {
- isUnstyled: {
- immediate: true,
- handler(newValue) {
- !newValue && loadStyle();
- }
- }
+ provide() {
+ return {
+ $parentInstance: this
+ };
}
};
diff --git a/components/lib/tabview/BaseTabView.vue b/components/lib/tabview/BaseTabView.vue
index 0c14fe487..8088dd9c5 100644
--- a/components/lib/tabview/BaseTabView.vue
+++ b/components/lib/tabview/BaseTabView.vue
@@ -103,7 +103,7 @@ const classes = {
panelContainer: 'p-tabview-panels'
};
-const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_tabview_style', manual: true });
+const { load: loadStyle } = useStyle(styles, { id: 'primevue_tabview_style', manual: true });
export default {
name: 'BaseTabView',
@@ -147,15 +147,13 @@ export default {
}
},
css: {
- classes
+ classes,
+ loadStyle
},
- watch: {
- isUnstyled: {
- immediate: true,
- handler(newValue) {
- !newValue && loadStyle();
- }
- }
+ provide() {
+ return {
+ $parentInstance: this
+ };
}
};
diff --git a/components/lib/tieredmenu/BaseTieredMenu.vue b/components/lib/tieredmenu/BaseTieredMenu.vue
index c5a775491..bb352fbdb 100644
--- a/components/lib/tieredmenu/BaseTieredMenu.vue
+++ b/components/lib/tieredmenu/BaseTieredMenu.vue
@@ -45,7 +45,7 @@ const styles = `
`;
const inlineStyles = {
- submenu: ({ context, processedItem }) => ({ display: context.isItemActive(processedItem) ? 'block' : 'none' })
+ submenu: ({ instance, processedItem }) => ({ display: instance.isItemActive(processedItem) ? 'block' : 'none' })
};
const classes = {
@@ -58,20 +58,20 @@ const classes = {
}
],
menu: 'p-tieredmenu-root-list',
- menuitem: ({ context, processedItem }) => [
+ menuitem: ({ instance, processedItem }) => [
'p-menuitem',
{
- 'p-menuitem-active p-highlight': context.isItemActive(processedItem),
- 'p-focus': context.isItemFocused(processedItem),
- 'p-disabled': context.isItemDisabled(processedItem)
+ 'p-menuitem-active p-highlight': instance.isItemActive(processedItem),
+ 'p-focus': instance.isItemFocused(processedItem),
+ 'p-disabled': instance.isItemDisabled(processedItem)
}
],
content: 'p-menuitem-content',
- action: ({ context, isActive, isExactActive }) => [
+ action: ({ instance, isActive, isExactActive }) => [
'p-menuitem-link',
{
'router-link-active': isActive,
- 'router-link-active-exact': context.exact && isExactActive
+ 'router-link-active-exact': instance.exact && isExactActive
}
],
icon: 'p-menuitem-icon',
@@ -81,7 +81,7 @@ const classes = {
separator: 'p-menuitem-separator'
};
-const { load: loadStyle, unload: unloadStyle } = useStyle(styles, { id: 'primevue_tieredmenu_style', manual: true });
+const { load: loadStyle } = useStyle(styles, { id: 'primevue_tieredmenu_style', manual: true });
export default {
name: 'BaseTieredMenu',
@@ -130,15 +130,13 @@ export default {
},
css: {
classes,
- inlineStyles
+ inlineStyles,
+ loadStyle
},
- watch: {
- isUnstyled: {
- immediate: true,
- handler(newValue) {
- !newValue && loadStyle();
- }
- }
+ provide() {
+ return {
+ $parentInstance: this
+ };
}
};
diff --git a/components/lib/tieredmenu/TieredMenuSub.vue b/components/lib/tieredmenu/TieredMenuSub.vue
index ff877f392..b3a7a7a80 100755
--- a/components/lib/tieredmenu/TieredMenuSub.vue
+++ b/components/lib/tieredmenu/TieredMenuSub.vue
@@ -1,11 +1,11 @@
-