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

Multiview and Tabpanel: publish visible option #27957

Merged
merged 8 commits into from
Sep 2, 2024
Merged

Multiview and Tabpanel: publish visible option #27957

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0f8dd9e
add visible option in d.ts of multiview and tabpanel
nikkithelegendarypokemonster Aug 27, 2024
acba3b3
add more files
nikkithelegendarypokemonster Aug 27, 2024
3ea432a
Revert "add visible option in d.ts of multiview and tabpanel"
nikkithelegendarypokemonster Aug 27, 2024
a8318bd
Revert "add more files"
nikkithelegendarypokemonster Aug 27, 2024
2e77c3d
refactor code based from review
nikkithelegendarypokemonster Aug 27, 2024
d580b23
add 'visible' item member to dxTabPanelItemOptions
EugeniyKiyashko Aug 29, 2024
5e2c111
Merge branch '24_2' of https://github.com/DevExpress/DevExtreme into …
nikkithelegendarypokemonster Aug 30, 2024
b92bf47
Merge branch '24_2' into 24_2-MultiView-and-tabpanel-visible-publish
EugeniyKiyashko Aug 31, 2024
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
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/multi-view/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,10 @@ export class DxMultiViewComponent<TItem = any, TKey = any> extends DxComponent i

*/
@Input()
get items(): Array<string | any | { disabled?: boolean, html?: string, template?: any, text?: string }> {
get items(): Array<string | any | { disabled?: boolean, html?: string, template?: any, text?: string, visible?: boolean }> {
return this._getOption('items');
}
set items(value: Array<string | any | { disabled?: boolean, html?: string, template?: any, text?: string }>) {
set items(value: Array<string | any | { disabled?: boolean, html?: string, template?: any, text?: string, visible?: boolean }>) {
this._setOption('items', value);
}

Expand Down Expand Up @@ -522,7 +522,7 @@ export class DxMultiViewComponent<TItem = any, TKey = any> extends DxComponent i
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() itemsChange: EventEmitter<Array<string | any | { disabled?: boolean, html?: string, template?: any, text?: string }>>;
@Output() itemsChange: EventEmitter<Array<string | any | { disabled?: boolean, html?: string, template?: any, text?: string, visible?: boolean }>>;

/**

Expand Down
4 changes: 2 additions & 2 deletions packages/devextreme-angular/src/ui/nested/base/tab-panel-options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ export abstract class DxoTabPanelOptions extends NestedOption {
this._setOption('itemHoldTimeout', value);
}

get items(): Array<string | any | { badge?: string, disabled?: boolean, html?: string, icon?: string, tabTemplate?: any, template?: any, text?: string, title?: string }> {
get items(): Array<string | any | { badge?: string, disabled?: boolean, html?: string, icon?: string, tabTemplate?: any, template?: any, text?: string, title?: string, visible?: boolean }> {
return this._getOption('items');
}
set items(value: Array<string | any | { badge?: string, disabled?: boolean, html?: string, icon?: string, tabTemplate?: any, template?: any, text?: string, title?: string }>) {
set items(value: Array<string | any | { badge?: string, disabled?: boolean, html?: string, icon?: string, tabTemplate?: any, template?: any, text?: string, title?: string, visible?: boolean }>) {
this._setOption('items', value);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-angular/src/ui/nested/tab-panel-options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class DxoTabPanelOptionsComponent extends DxoTabPanelOptions implements O
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() itemsChange: EventEmitter<Array<string | any | { badge?: string, disabled?: boolean, html?: string, icon?: string, tabTemplate?: any, template?: any, text?: string, title?: string }>>;
@Output() itemsChange: EventEmitter<Array<string | any | { badge?: string, disabled?: boolean, html?: string, icon?: string, tabTemplate?: any, template?: any, text?: string, title?: string, visible?: boolean }>>;

/**

Expand Down
6 changes: 3 additions & 3 deletions packages/devextreme-angular/src/ui/tab-panel/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,10 @@ export class DxTabPanelComponent<TItem = any, TKey = any> extends DxComponent im

*/
@Input()
get items(): Array<string | any | { badge?: string, disabled?: boolean, html?: string, icon?: string, tabTemplate?: any, template?: any, text?: string, title?: string }> {
get items(): Array<string | any | { badge?: string, disabled?: boolean, html?: string, icon?: string, tabTemplate?: any, template?: any, text?: string, title?: string, visible?: boolean }> {
return this._getOption('items');
}
set items(value: Array<string | any | { badge?: string, disabled?: boolean, html?: string, icon?: string, tabTemplate?: any, template?: any, text?: string, title?: string }>) {
set items(value: Array<string | any | { badge?: string, disabled?: boolean, html?: string, icon?: string, tabTemplate?: any, template?: any, text?: string, title?: string, visible?: boolean }>) {
this._setOption('items', value);
}

Expand Down Expand Up @@ -658,7 +658,7 @@ export class DxTabPanelComponent<TItem = any, TKey = any> extends DxComponent im
* This member supports the internal infrastructure and is not intended to be used directly from your code.

*/
@Output() itemsChange: EventEmitter<Array<string | any | { badge?: string, disabled?: boolean, html?: string, icon?: string, tabTemplate?: any, template?: any, text?: string, title?: string }>>;
@Output() itemsChange: EventEmitter<Array<string | any | { badge?: string, disabled?: boolean, html?: string, icon?: string, tabTemplate?: any, template?: any, text?: string, title?: string, visible?: boolean }>>;

/**

Expand Down
3 changes: 2 additions & 1 deletion packages/devextreme-react/src/form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ type IItemProps = React.PropsWithChildren<{
template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template;
text?: string;
title?: string;
visible?: boolean;
colSpan?: number;
cssClass?: string;
dataField?: string;
Expand All @@ -378,7 +379,6 @@ type IItemProps = React.PropsWithChildren<{
};
name?: string;
validationRules?: Array<CommonTypes.ValidationRule>;
visible?: boolean;
visibleIndex?: number;
alignItemLabels?: boolean;
caption?: string;
Expand Down Expand Up @@ -830,6 +830,7 @@ type ITabPanelOptionsItemProps = React.PropsWithChildren<{
template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template;
text?: string;
title?: string;
visible?: boolean;
tabRender?: (...params: any) => React.ReactNode;
tabComponent?: React.ComponentType<any>;
render?: (...params: any) => React.ReactNode;
Expand Down
1 change: 1 addition & 0 deletions packages/devextreme-react/src/multi-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ type IItemProps = React.PropsWithChildren<{
html?: string;
template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template;
text?: string;
visible?: boolean;
render?: (...params: any) => React.ReactNode;
component?: React.ComponentType<any>;
}>
Expand Down
1 change: 1 addition & 0 deletions packages/devextreme-react/src/tab-panel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ type IItemProps = React.PropsWithChildren<{
template?: ((itemData: CollectionWidgetItem, itemIndex: number, itemElement: any) => string | any) | template;
text?: string;
title?: string;
visible?: boolean;
tabRender?: (...params: any) => React.ReactNode;
tabComponent?: React.ComponentType<any>;
render?: (...params: any) => React.ReactNode;
Expand Down
4 changes: 3 additions & 1 deletion packages/devextreme-vue/src/form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,7 @@ const DxTabPanelOptionsItem = createConfigurationComponent({
"update:template": null,
"update:text": null,
"update:title": null,
"update:visible": null,
},
props: {
badge: String,
Expand All @@ -866,7 +867,8 @@ const DxTabPanelOptionsItem = createConfigurationComponent({
tabTemplate: {},
template: {},
text: String,
title: String
title: String,
visible: Boolean
}
});
(DxTabPanelOptionsItem as any).$_optionName = "items";
Expand Down
4 changes: 3 additions & 1 deletion packages/devextreme-vue/src/multi-view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,14 @@ const DxItem = createConfigurationComponent({
"update:html": null,
"update:template": null,
"update:text": null,
"update:visible": null,
},
props: {
disabled: Boolean,
html: String,
template: {},
text: String
text: String,
visible: Boolean
}
});
(DxItem as any).$_optionName = "items";
Expand Down
4 changes: 3 additions & 1 deletion packages/devextreme-vue/src/tab-panel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ const DxItem = createConfigurationComponent({
"update:template": null,
"update:text": null,
"update:title": null,
"update:visible": null,
},
props: {
badge: String,
Expand All @@ -180,7 +181,8 @@ const DxItem = createConfigurationComponent({
tabTemplate: {},
template: {},
text: String,
title: String
title: String,
visible: Boolean
}
});
(DxItem as any).$_optionName = "items";
Expand Down
5 changes: 0 additions & 5 deletions packages/devextreme/js/ui/multi_view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ export default MultiView;
* @hidden
*/

/**
* @name dxMultiViewItem.visible
* @hidden
*/

/**
* @name dxMultiViewItem
* @inherits CollectionWidgetItem
Expand Down
5 changes: 0 additions & 5 deletions packages/devextreme/js/ui/tab_panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ export default TabPanel;

// STYLE tabPanel

/**
* @name dxTabPanelItem.visible
* @hidden
*/

/**
* @name dxTabPanelItem
* @inherits dxMultiViewItem
Expand Down
Loading