From fe9a832b987963363dab03cd4870e11e8a278f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Tue, 22 Aug 2023 19:54:28 +0400 Subject: [PATCH 01/34] Tabs: icon position --- .../testing/tests/DevExpress.ui.widgets/tabs.tests.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js index 4d188c198104..7f5afb0fbf2d 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js @@ -42,12 +42,15 @@ const TABS_ORIENTATION_CLASS = { vertical: 'dx-tabs-vertical', horizontal: 'dx-tabs-horizontal', }; +<<<<<<< HEAD const TABS_ICON_POSITION_CLASS = { top: 'dx-tabs-icon-position-top', end: 'dx-tabs-icon-position-end', bottom: 'dx-tabs-icon-position-bottom', start: 'dx-tabs-icon-position-start', }; +======= +>>>>>>> 8eb4dc7652 (Tabs: icon position) const TABS_WRAPPER_CLASS = 'dx-tabs-wrapper'; const TABS_NAV_BUTTON_CLASS = 'dx-tabs-nav-button'; const TABS_NAV_BUTTONS_CLASS = 'dx-tabs-nav-buttons'; From b2893d063bbcdf24d2995b96e33d4393e2063821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Tue, 22 Aug 2023 20:48:50 +0400 Subject: [PATCH 02/34] feat(tabs): Update TS --- packages/devextreme-angular/src/common/index.ts | 1 + packages/devextreme-react/src/common/index.ts | 1 + packages/devextreme-vue/src/common/index.ts | 1 + packages/devextreme/js/common.d.ts | 6 ++++++ .../testing/tests/DevExpress.ui.widgets/tabs.tests.js | 3 --- packages/devextreme/ts/dx.all.d.ts | 1 + 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index a839f33156e8..5b6d7fed70fd 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index bd42a4a4bb97..925634469d5f 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index bd42a4a4bb97..925634469d5f 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index 80a9ef21c014..bcbf99d40268 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -495,6 +495,12 @@ export type Position = 'bottom' | 'left' | 'right' | 'top'; */ export type PositionAlignment = 'bottom' | 'center' | 'left' | 'left bottom' | 'left top' | 'right' | 'right bottom' | 'right top' | 'top'; +/** + * @public + * @namespace DevExpress.common + */ +export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; + /** * @docid * @public diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js index 7f5afb0fbf2d..4d188c198104 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js @@ -42,15 +42,12 @@ const TABS_ORIENTATION_CLASS = { vertical: 'dx-tabs-vertical', horizontal: 'dx-tabs-horizontal', }; -<<<<<<< HEAD const TABS_ICON_POSITION_CLASS = { top: 'dx-tabs-icon-position-top', end: 'dx-tabs-icon-position-end', bottom: 'dx-tabs-icon-position-bottom', start: 'dx-tabs-icon-position-start', }; -======= ->>>>>>> 8eb4dc7652 (Tabs: icon position) const TABS_WRAPPER_CLASS = 'dx-tabs-wrapper'; const TABS_NAV_BUTTON_CLASS = 'dx-tabs-nav-button'; const TABS_NAV_BUTTONS_CLASS = 'dx-tabs-nav-buttons'; diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index cbee855e170d..873750c57645 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -1657,6 +1657,7 @@ declare module DevExpress.common { | 'right bottom' | 'right top' | 'top'; + export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; /** * [descr:RangeRule] */ From 72c307ffbd12f938a08f915490693ff13d0335fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 23 Aug 2023 15:10:57 +0400 Subject: [PATCH 03/34] fix(d.ts): Rename type --- packages/devextreme-react/src/common/index.ts | 2 +- packages/devextreme-vue/src/common/index.ts | 2 +- packages/devextreme/js/common.d.ts | 2 +- packages/devextreme/ts/dx.all.d.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index 925634469d5f..6c70ec1ef608 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -31,7 +31,7 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, + PositionRelative, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index 925634469d5f..6c70ec1ef608 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -31,7 +31,7 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, + PositionRelative, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index bcbf99d40268..dc68c99ee48b 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -499,7 +499,7 @@ export type PositionAlignment = 'bottom' | 'center' | 'left' | 'left bottom' | ' * @public * @namespace DevExpress.common */ -export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; +export type PositionRelative = 'top' | 'end' | 'bottom' | 'start'; /** * @docid diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index 873750c57645..53e16c964b95 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -1657,7 +1657,7 @@ declare module DevExpress.common { | 'right bottom' | 'right top' | 'top'; - export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; + export type PositionRelative = 'top' | 'end' | 'bottom' | 'start'; /** * [descr:RangeRule] */ From 33e2a695b3e8046cde54ff502b4adbc151f457e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 23 Aug 2023 18:11:49 +0400 Subject: [PATCH 04/34] fix(angular): Generate --- packages/devextreme-angular/src/common/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index 5b6d7fed70fd..a839f33156e8 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, RangeRule, RequiredRule, Scrollable, From 45731c0b7dc02849507d024b20cd4a33cdca3c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Mon, 28 Aug 2023 11:02:04 +0400 Subject: [PATCH 05/34] fix(d.ts): Update d.ts --- packages/devextreme-react/src/common/index.ts | 1 - packages/devextreme-vue/src/common/index.ts | 1 - packages/devextreme/js/common.d.ts | 6 ------ packages/devextreme/ts/dx.all.d.ts | 1 - 4 files changed, 9 deletions(-) diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index 6c70ec1ef608..bd42a4a4bb97 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionRelative, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index 6c70ec1ef608..bd42a4a4bb97 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionRelative, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index dc68c99ee48b..80a9ef21c014 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -495,12 +495,6 @@ export type Position = 'bottom' | 'left' | 'right' | 'top'; */ export type PositionAlignment = 'bottom' | 'center' | 'left' | 'left bottom' | 'left top' | 'right' | 'right bottom' | 'right top' | 'top'; -/** - * @public - * @namespace DevExpress.common - */ -export type PositionRelative = 'top' | 'end' | 'bottom' | 'start'; - /** * @docid * @public diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index 53e16c964b95..cbee855e170d 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -1657,7 +1657,6 @@ declare module DevExpress.common { | 'right bottom' | 'right top' | 'top'; - export type PositionRelative = 'top' | 'end' | 'bottom' | 'start'; /** * [descr:RangeRule] */ From 88294dc3c8699414ca9aee753dd1b4248f5c9ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 30 Aug 2023 19:19:34 +0400 Subject: [PATCH 06/34] fix(package-lock): Update sha512 --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 197b2b0a2063..f7cb43f00f50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13794,7 +13794,7 @@ "node_modules/devextreme-react-generator": { "version": "4.1.7", "resolved": "https://gitpkg.now.sh/DevExpress/devextreme-react/packages/devextreme-react-generator?master", - "integrity": "sha512-UBI8TcBAhR+LpG2Kueqzf/8UtIgkr3QqdXvYr6QF8ZovNMybZXghzlMJJaJrZRI/i+qoqdhyjflxJZQapUmqBQ==", + "integrity": "sha512-hsmDWqaWLkEf3hTZXvkcj/10jCMLWHhH69VLmVnny86TiFFsa56S549IN55K2RPp5PRTnbshhxObIavwtxW3vg==", "dev": true, "license": "MIT", "dependencies": { From 41f25f2d4c169799629fe7bb0f4962d2ff7f401b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE=20=7C=20Roman=20Ty?= Date: Wed, 30 Aug 2023 19:52:58 +0400 Subject: [PATCH 07/34] fix(package-lock): Update sha512 --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index f7cb43f00f50..197b2b0a2063 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13794,7 +13794,7 @@ "node_modules/devextreme-react-generator": { "version": "4.1.7", "resolved": "https://gitpkg.now.sh/DevExpress/devextreme-react/packages/devextreme-react-generator?master", - "integrity": "sha512-hsmDWqaWLkEf3hTZXvkcj/10jCMLWHhH69VLmVnny86TiFFsa56S549IN55K2RPp5PRTnbshhxObIavwtxW3vg==", + "integrity": "sha512-UBI8TcBAhR+LpG2Kueqzf/8UtIgkr3QqdXvYr6QF8ZovNMybZXghzlMJJaJrZRI/i+qoqdhyjflxJZQapUmqBQ==", "dev": true, "license": "MIT", "dependencies": { From 222afb20bdf865d9228824b1e993b36ef350c34d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Tue, 22 Aug 2023 20:48:50 +0400 Subject: [PATCH 08/34] feat(tabs): Update TS --- packages/devextreme-angular/src/common/index.ts | 1 + packages/devextreme-react/src/common/index.ts | 1 + packages/devextreme-vue/src/common/index.ts | 1 + packages/devextreme/js/common.d.ts | 6 ++++++ packages/devextreme/ts/dx.all.d.ts | 1 + 5 files changed, 10 insertions(+) diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index a839f33156e8..5b6d7fed70fd 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index bd42a4a4bb97..925634469d5f 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index bd42a4a4bb97..925634469d5f 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index 80a9ef21c014..bcbf99d40268 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -495,6 +495,12 @@ export type Position = 'bottom' | 'left' | 'right' | 'top'; */ export type PositionAlignment = 'bottom' | 'center' | 'left' | 'left bottom' | 'left top' | 'right' | 'right bottom' | 'right top' | 'top'; +/** + * @public + * @namespace DevExpress.common + */ +export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; + /** * @docid * @public diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index cbee855e170d..873750c57645 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -1657,6 +1657,7 @@ declare module DevExpress.common { | 'right bottom' | 'right top' | 'top'; + export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; /** * [descr:RangeRule] */ From ebc70b78887f35118ee12f962f8be9b3ccd02348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 23 Aug 2023 14:44:00 +0400 Subject: [PATCH 09/34] feat(tabs): Update etalons --- ... item active,rtl=false (generic-light).png | Bin 7944 -> 7970 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/devextreme/testing/testcafe/tests/navigation/tabPanel/etalons/TabPanel 1 item active,rtl=false (generic-light).png b/packages/devextreme/testing/testcafe/tests/navigation/tabPanel/etalons/TabPanel 1 item active,rtl=false (generic-light).png index ab0d9b30e171b4d51d8c84b8fe5b7579364eabe6..ee81917c8c69ccc8a1ede506010d1230077f4f9d 100644 GIT binary patch literal 7970 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 literal 7944 zcmeHscRW}B-*z4VJn$;qG5B&zBc zy#95w)AF|w|6=c3^WNYa1$EbglI%%&uMg+Ff2@6%;U;gPj$%bK%US;J#zy%JhcJch z6-6XF8jT+7A2t3t@7f~LIgq(w!9i_{h#&5*eCM`m z46=`V9FTa{PWOrK$pOuF7H5{jex9zce0@o&JPt^bFuum0C0Dq1o$xqN>3xO-2XTdq zILzpiO5#AFhLcV_3U|X{pz43Rq$mE{H;v!TQFRGY-o&|6M(G+EOy|z+8z?aspmkdQBW;x1^}XaFr{?W{kClQ(Mn*xQ zp zBsy9_Nol`C9!spf8~5$nnU$fy_BL-um&?Y+%#5xZ+*>3jt+6%6xk1s<&sG@o^YdSZ zgtUGC?$bS0tH*VKn%c9&tfsX!P~OwS%)g2!H9{o)%ER67lwy)a9NcQh%78j5G z`0+wn=G>f(fq{Vv)vj3yyQv@2j*i0g$NXgu9Xe#c)MYZ(naL<9Z)wRfRO>I5(r*3c zW{F);Y^;*3Oj3}C$Ie*irR!^p6W&Fo&z_MRx5hSa{$0ObWOd@$v16wB+V8wWC;IJ5 zu9w<#J1tEn+$gj(G%>l&6S0!;jE3L$$&Niac2n9kG&D1(OCC zA|10y5ejVPDkPkZ;$QqgE7mZ7@9k{$|qEd8p>a&i@VT=BvV zbEnuf-~IX&!8^L>xSN9E(_~lf?DFzRZmakZh3m?W+qKUI`~`pNRr?(LH8O%-Av%h9 z*iIq3{l0#FW8X4pHPWd$gBvcHnzFjCclWWfvnSmjX|XlT?K@Ex}nJ$aU z%Hk^BPcKZIc=6)JXmRIA)HKn|)HFUdm87IMAd&UbrAwbbI6b729=KvFOuyTGdq{;| z|5EoolfE)%J^_J4G&HCenWv{Gu|2c)KF^+=!ZsIn6MZCiU^D#<^ zNl8xw14rUQy3A{v%msp9yr>+Bb8U$gbGm%_@`Xi=+iW9yrq$Bq^~$QMW8#m_V}t8j zTPZTp3_qQhZ$6Vb87Q`Nw0vWjQx*FY%6Y3LCC=rFl++G6Il0o6K|geJ>LoP@H10{Q*lpAv4ByQG@ky?gz=?U`H7i_}Uf!Nf)%(Y4?1SK~H5+Lm-yr|9|k zxY^p$R8xP2dsmkJj_K0*{b`geN?DIqZOT@E(=IrQRe9|@321V4brt`+pq7)9LyU4) zjuDwalz(;grNf-M3VM3S1=XyqxSB%G4GEU7?jt5pkLx+`N+xMQn^h-?nqA{Lnjh=J zDM@N6NFIKcibh{kRZEwDI-S)m4UZ9d_#!IGuXA>&4ozk<|GU}H&~Ro%Vk@Gu zQc_(zBNR_({3*P`Yai`O4X4XRJ39e}KyTV%yAnBh`6`3#tOpYsKV8->0HIx7U8$lB z6!RmkDS$WgzOoqpyWgxvKc6VD?Df5p(yn^zma??;E?PlL!==eCa=P=+pHi~q;QF0k zzkcl>8Id(NKO06$LUNpqjWnvcHe}RR7&U$K=1oO&jR1h}yyM~+*$TV;>xKqaW`~ZF?*^*L+Su@9WMo7O-QOLfB%7iXlbV)R z*)(Q*6)Ul|<&#)#P*z!-?qft{ss{SMXWzagE6Z!uf8o#j368Y1G|Y`ua+_&Zm$`?R z*OwG!M#shRn&SH-S>01Bhj7CiH)zvPNtgMkJ}$dStzE-wBW z9-iG?pQb!;;NzEMc~x*rP-JAIvg?|f_{NMBaof$6I*CM9QntXls-EKeV;$*77+qFQ zxURLwowuJk4i1w^?l8;lGJpB<<;?G>dvh%!)5Lhq&CeH8dw6^2qDjFv^{uTYHNMn3 z?4EbC92d=O?%#jG~CVnQ2YFZ)KMNo5-Bfo z{rcx8(3$-YHdd?~8yoHa6pwHnB}ZN6unoCR%a-8f&!&8DZxjXqbQ3!#vbE0kJnVCR z^mnn-zH7?vwL*kjm$^)O2h*mYch$uU7qNJ&^J~ky=WvgH8m-SgtQ+&v;ji+Ci!ccnz#9AurO9%w+2HdVPTr6W-m=F<>0}C zsbIghiA6p^!67m*h=YRzy4Fj-$}7Qf>+kZ|k9>BJifl@ITaqk=%TjLKY@00O0QI3m zm1@djo(+ZupW`nsjCc68N^C_J6bKM4$lEF^h39ho5DSh{Ra2{iESjMavN?qoI*kXS z9k3N{Xlfb)(U8*$kavhomsTYOieE7>V8YXoALH>5cV3(M=`@|-IN*7tzOj*skB=(2 zp}LAfLgC`Y?P&z67j{PoKVaLweLF#gWzOq^7?8czTce*WsZ~`~2?ngMzdScLrWe+I~H`1s>M zFsw*N3Dhvs5|fmiyvtvPC?JUbQ5YUJzRgr6zpxM$1g}Y^cMMvcpRpHx1YFih13sZY zpmb7!R^|c_kUjwcziqU&wYg~gZ4LQogj_d8bvHLRZC|mHS{6pR%0RAMbl*KNY%9zi z)l2{}P+fg^c(}T*u3feB-Oa8tXAxb1vrJN3zfrap0bItps91!!vv62iYHBL#d~#my^$x4hJI=~V!udg0`R-lz!bAQt?qPsfZPVi2D00<+ z)$^#RrnlE~wTf*{WBYm(X#BmVzkK`V6$Tb6G3BFqN8s)#Gzoo-nA2h6J}N2)MC>N} zZJ<@;l$A~X^c0J3%v3>b>N*Tlv$3o^eG^r*w0r>PB|X-4^gDO&PW&=v3lJ)$ zlD?SU!DIUQ_`6eVY`(y4;RoZFZr-FX>~j(6tQwl_NAJ#1?{UxG~=v4C(E2 z@MKXW2C5XC9QI{m5t2+jO28r!c7domb%;j#up`Juz~YBT=X|S#^3|({PRcy{*rdnB zWzs^&tQc9Htiy4H*Z7lO|Hmhgt|3tD;;X+X4|C}FG!D(icbJV`R;4QS_4N%GdC0+8 zI`a=&?NWNjiO{Wir`=jrS*FhjP&v%Z)Hd||YNYixhN9n+D`mJ4nm4_p(QOym_W}#rJ^SfCvg4_FO|^r~xW z-rwACU~t{ACY(mhdFy{NF|^QX)>vqaxHCX){1RSGw{kq)k+b93QCeF^zQXM&>rloZmA1Ep+s$aWi4Y}p! z=9Z;(R!0%&*4*5zuAy;=n!08foePRIH8ZOmwo$!$)eT;A%+@9eCzFtpCT3+FNNIoC zG&~44prWGcH{yvPAt#5}^%xyBB}S(MJO?l|&W!+JVo0%}kpEY&Uw;Z#y%5MCW2TOBn}tzTFABy0vr3P> z8?%9~_`028P15kH%A&J7G1X0A#8mi;JLp&Kh0!+mlvqb!X}`nzh25%((dUDJk2!Gj z7%*=NM&mE9q@2pA)3cu(27mL<^yIn{8LGUM+%Nz!j%iSiHe@T#r_))InNjwex%|x(jCOPX;~@ z3aWT{M(wDeC7qy}jLdEe3kwB2NF9R{xpx%?m`r8yPj3{F8BE;Tie!m<1f5w&##wp+ zSO9H4WW(UHqF=T)&d%U8$zAR0=jV6w%$dCE*lc3&A&cD;gJqI|6*Gn`BRAGWZjnwf#BRp?9m{wI61vh=oNQeP3A2IVXR z*$%s61fM+lBi~PAV}Js%!;u0HOGvtnrt%FkB5TnWoBzbSbLY8x!uEV zxkQ|h@_HT-(ExNHG#vL)@{RTKEfHcipX_1ihsI$N5sB)yEb+GY9KkWS=M7I2!O`C8{}&r99*|4)_Hb}*K2E|b*makuBBC9V9|Z_ zyw!0DV`98;;c;GGO0<{%XB&6aQ$CDCnq+qQ;jj9G=zkFFaW1X{C(1Z8G@4$Vme(pU zKL+AsI(5neK~{L&*2c(2IMJ&=KRC@hn;w+xv2k4fQ-Ur7;gTHHwK3j_atMu;w z4*c4GGrT*!yx30sr7)7%F~+g2g+Cqw%PQyg@X8W#Vb7KQ#sU3|8Q87=BN6m0PXg7! zRY~dVpFk8?9rz@4%LFjQ$A{>?l_TH{O_UYw>A zu_H%e#Fl%iN*(4&$jGWDzP?fW6ekgvlfwhnXsEA0E+BBYB7BK#jgJ;QinOtmgIH#giyuGN4f@DoNKQ|+>~ z-gh5pfXuCUYjZsUiUf&Ihtu?jI@)`s7mbWg0|69bMI+>bnG?`oXK%iLx!mU(2Tmt4 z0^~a3cy8z)0zN|6HFF@~$0sJndWv~r<1q?HI>3&{xD9s72GAws<)Ipfftmya5c_if zPBAGG4=e}fR0^aEd@5c4Qv&vT5gJ;1&vpGq=(!tSn!36SoaGxlSPQWw3k$a2GH)q6 zI0$Vm-P@AEEK-Oq97s-1{uC_~{Q0vA!8@2<$H5r&w6#OZxuq2N(kd>!)3oMWECW&Fv-9A?)nJbYI-%Lkz%OLKy^TrTnsj1EQj@}!U(~83?+6`k}2)Lovu;` z-gM2(T7&GFu<{L00=d?w%NcRu0ZE@I*#Qxx!n11=nY{KhddS0Alw)6^;UM=QU-nW^ zjA)jxQOCJ%3L)XJC)kicG(4}%YSS&7!Ro!^nS z^PRmY12im#LaHNK{s=KbDqZFR$OO(iF0eYUEhHonl7+BFy2w!t7soq@R0>)E{`W;} zY(N^q65KrgqI;40g9rTC+1aJ&b)wI{c621Ll7cOfJE|jSgZw1!gITpN*5S}~n&MxY z>h`W0xRBHqZ)Rap!;YYe6Ai153IL>vit}u_Fo3lI^nU*d`mX1ApwAE!R(9ZyrD(L` zm*wRWaOCjyK_MYEAwI%wZF>FHJJ&|T81(2VvFRQod<8?O+m1#+B}jBG5mpdb|QRmuXN zKR@svl^uczf*08h4-XH5j#PZ+@9z&~&ya~}1{V4dZAb9*!ekfaH7HZK=_+cbw(3mz2J?-Y4&xJWFp>U)8TI*Sjv?59W-FborN#O11mTFr?v<@FYa$Ce!^xSF zoqZ6ASN>&r`6Nt{KdoTmduZ>X`4*9e#>T{V@AgAPf#>WuS4UK9s;dbTiG|`F4L}>& zvvF?1cwf0hcj3Jh^bgMUrDlf%vA=%yZ~&u(5~ML&l!=p*B16Nk*;oqwoYCCMV?S4E zGOetK{1q>WzNBk%5_1ftbEU|5MA zYK{_|NA@;|h*kDRf%yq;?jYR{jsr$~G-F@iPy*D*8O5XVD&R$M@akl4Ykf-#v!LLS z+^$a>tMf2*7-}N5hdEini>wG9BhucIhbB`$@&N*b!A0I?KOCY-fQ_=)BGn!WhF7jz zo3<0*{E_G*7<52NPbj@`fFEl1R`)|BM8p05kJ|@_hKT$z?e%MB0n48Hp+E^GgagE@ zy8wPh>crw@Px@H*h?58Ung^@^Mk<&>;)Mt(uV^IJ2`A1DeZ_l3(!sO>^RCJw>mgPS zj@QY_p2(dK(9tO%$-=!{dh&eIX+VR>L9ymHMow-nl;M9mubt`L6*%t5NCLQU z#bz-pp*jASuOI*aCI63iEN>%Bd`#pZ3i7CJYuE9m6YvR-Xp4)!` D>9TW5 From d7b2024c1cce945ab9063ca5fbf0ee1ae7f73775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 23 Aug 2023 15:59:06 +0400 Subject: [PATCH 10/34] fix(etalons): Update etalon && Add new etalons --- ... item active,rtl=false (generic-light).png | Bin 7970 -> 7944 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/packages/devextreme/testing/testcafe/tests/navigation/tabPanel/etalons/TabPanel 1 item active,rtl=false (generic-light).png b/packages/devextreme/testing/testcafe/tests/navigation/tabPanel/etalons/TabPanel 1 item active,rtl=false (generic-light).png index ee81917c8c69ccc8a1ede506010d1230077f4f9d..ab0d9b30e171b4d51d8c84b8fe5b7579364eabe6 100644 GIT binary patch literal 7944 zcmeHscRW}B-*z4VJn$;qG5B&zBc zy#95w)AF|w|6=c3^WNYa1$EbglI%%&uMg+Ff2@6%;U;gPj$%bK%US;J#zy%JhcJch z6-6XF8jT+7A2t3t@7f~LIgq(w!9i_{h#&5*eCM`m z46=`V9FTa{PWOrK$pOuF7H5{jex9zce0@o&JPt^bFuum0C0Dq1o$xqN>3xO-2XTdq zILzpiO5#AFhLcV_3U|X{pz43Rq$mE{H;v!TQFRGY-o&|6M(G+EOy|z+8z?aspmkdQBW;x1^}XaFr{?W{kClQ(Mn*xQ zp zBsy9_Nol`C9!spf8~5$nnU$fy_BL-um&?Y+%#5xZ+*>3jt+6%6xk1s<&sG@o^YdSZ zgtUGC?$bS0tH*VKn%c9&tfsX!P~OwS%)g2!H9{o)%ER67lwy)a9NcQh%78j5G z`0+wn=G>f(fq{Vv)vj3yyQv@2j*i0g$NXgu9Xe#c)MYZ(naL<9Z)wRfRO>I5(r*3c zW{F);Y^;*3Oj3}C$Ie*irR!^p6W&Fo&z_MRx5hSa{$0ObWOd@$v16wB+V8wWC;IJ5 zu9w<#J1tEn+$gj(G%>l&6S0!;jE3L$$&Niac2n9kG&D1(OCC zA|10y5ejVPDkPkZ;$QqgE7mZ7@9k{$|qEd8p>a&i@VT=BvV zbEnuf-~IX&!8^L>xSN9E(_~lf?DFzRZmakZh3m?W+qKUI`~`pNRr?(LH8O%-Av%h9 z*iIq3{l0#FW8X4pHPWd$gBvcHnzFjCclWWfvnSmjX|XlT?K@Ex}nJ$aU z%Hk^BPcKZIc=6)JXmRIA)HKn|)HFUdm87IMAd&UbrAwbbI6b729=KvFOuyTGdq{;| z|5EoolfE)%J^_J4G&HCenWv{Gu|2c)KF^+=!ZsIn6MZCiU^D#<^ zNl8xw14rUQy3A{v%msp9yr>+Bb8U$gbGm%_@`Xi=+iW9yrq$Bq^~$QMW8#m_V}t8j zTPZTp3_qQhZ$6Vb87Q`Nw0vWjQx*FY%6Y3LCC=rFl++G6Il0o6K|geJ>LoP@H10{Q*lpAv4ByQG@ky?gz=?U`H7i_}Uf!Nf)%(Y4?1SK~H5+Lm-yr|9|k zxY^p$R8xP2dsmkJj_K0*{b`geN?DIqZOT@E(=IrQRe9|@321V4brt`+pq7)9LyU4) zjuDwalz(;grNf-M3VM3S1=XyqxSB%G4GEU7?jt5pkLx+`N+xMQn^h-?nqA{Lnjh=J zDM@N6NFIKcibh{kRZEwDI-S)m4UZ9d_#!IGuXA>&4ozk<|GU}H&~Ro%Vk@Gu zQc_(zBNR_({3*P`Yai`O4X4XRJ39e}KyTV%yAnBh`6`3#tOpYsKV8->0HIx7U8$lB z6!RmkDS$WgzOoqpyWgxvKc6VD?Df5p(yn^zma??;E?PlL!==eCa=P=+pHi~q;QF0k zzkcl>8Id(NKO06$LUNpqjWnvcHe}RR7&U$K=1oO&jR1h}yyM~+*$TV;>xKqaW`~ZF?*^*L+Su@9WMo7O-QOLfB%7iXlbV)R z*)(Q*6)Ul|<&#)#P*z!-?qft{ss{SMXWzagE6Z!uf8o#j368Y1G|Y`ua+_&Zm$`?R z*OwG!M#shRn&SH-S>01Bhj7CiH)zvPNtgMkJ}$dStzE-wBW z9-iG?pQb!;;NzEMc~x*rP-JAIvg?|f_{NMBaof$6I*CM9QntXls-EKeV;$*77+qFQ zxURLwowuJk4i1w^?l8;lGJpB<<;?G>dvh%!)5Lhq&CeH8dw6^2qDjFv^{uTYHNMn3 z?4EbC92d=O?%#jG~CVnQ2YFZ)KMNo5-Bfo z{rcx8(3$-YHdd?~8yoHa6pwHnB}ZN6unoCR%a-8f&!&8DZxjXqbQ3!#vbE0kJnVCR z^mnn-zH7?vwL*kjm$^)O2h*mYch$uU7qNJ&^J~ky=WvgH8m-SgtQ+&v;ji+Ci!ccnz#9AurO9%w+2HdVPTr6W-m=F<>0}C zsbIghiA6p^!67m*h=YRzy4Fj-$}7Qf>+kZ|k9>BJifl@ITaqk=%TjLKY@00O0QI3m zm1@djo(+ZupW`nsjCc68N^C_J6bKM4$lEF^h39ho5DSh{Ra2{iESjMavN?qoI*kXS z9k3N{Xlfb)(U8*$kavhomsTYOieE7>V8YXoALH>5cV3(M=`@|-IN*7tzOj*skB=(2 zp}LAfLgC`Y?P&z67j{PoKVaLweLF#gWzOq^7?8czTce*WsZ~`~2?ngMzdScLrWe+I~H`1s>M zFsw*N3Dhvs5|fmiyvtvPC?JUbQ5YUJzRgr6zpxM$1g}Y^cMMvcpRpHx1YFih13sZY zpmb7!R^|c_kUjwcziqU&wYg~gZ4LQogj_d8bvHLRZC|mHS{6pR%0RAMbl*KNY%9zi z)l2{}P+fg^c(}T*u3feB-Oa8tXAxb1vrJN3zfrap0bItps91!!vv62iYHBL#d~#my^$x4hJI=~V!udg0`R-lz!bAQt?qPsfZPVi2D00<+ z)$^#RrnlE~wTf*{WBYm(X#BmVzkK`V6$Tb6G3BFqN8s)#Gzoo-nA2h6J}N2)MC>N} zZJ<@;l$A~X^c0J3%v3>b>N*Tlv$3o^eG^r*w0r>PB|X-4^gDO&PW&=v3lJ)$ zlD?SU!DIUQ_`6eVY`(y4;RoZFZr-FX>~j(6tQwl_NAJ#1?{UxG~=v4C(E2 z@MKXW2C5XC9QI{m5t2+jO28r!c7domb%;j#up`Juz~YBT=X|S#^3|({PRcy{*rdnB zWzs^&tQc9Htiy4H*Z7lO|Hmhgt|3tD;;X+X4|C}FG!D(icbJV`R;4QS_4N%GdC0+8 zI`a=&?NWNjiO{Wir`=jrS*FhjP&v%Z)Hd||YNYixhN9n+D`mJ4nm4_p(QOym_W}#rJ^SfCvg4_FO|^r~xW z-rwACU~t{ACY(mhdFy{NF|^QX)>vqaxHCX){1RSGw{kq)k+b93QCeF^zQXM&>rloZmA1Ep+s$aWi4Y}p! z=9Z;(R!0%&*4*5zuAy;=n!08foePRIH8ZOmwo$!$)eT;A%+@9eCzFtpCT3+FNNIoC zG&~44prWGcH{yvPAt#5}^%xyBB}S(MJO?l|&W!+JVo0%}kpEY&Uw;Z#y%5MCW2TOBn}tzTFABy0vr3P> z8?%9~_`028P15kH%A&J7G1X0A#8mi;JLp&Kh0!+mlvqb!X}`nzh25%((dUDJk2!Gj z7%*=NM&mE9q@2pA)3cu(27mL<^yIn{8LGUM+%Nz!j%iSiHe@T#r_))InNjwex%|x(jCOPX;~@ z3aWT{M(wDeC7qy}jLdEe3kwB2NF9R{xpx%?m`r8yPj3{F8BE;Tie!m<1f5w&##wp+ zSO9H4WW(UHqF=T)&d%U8$zAR0=jV6w%$dCE*lc3&A&cD;gJqI|6*Gn`BRAGWZjnwf#BRp?9m{wI61vh=oNQeP3A2IVXR z*$%s61fM+lBi~PAV}Js%!;u0HOGvtnrt%FkB5TnWoBzbSbLY8x!uEV zxkQ|h@_HT-(ExNHG#vL)@{RTKEfHcipX_1ihsI$N5sB)yEb+GY9KkWS=M7I2!O`C8{}&r99*|4)_Hb}*K2E|b*makuBBC9V9|Z_ zyw!0DV`98;;c;GGO0<{%XB&6aQ$CDCnq+qQ;jj9G=zkFFaW1X{C(1Z8G@4$Vme(pU zKL+AsI(5neK~{L&*2c(2IMJ&=KRC@hn;w+xv2k4fQ-Ur7;gTHHwK3j_atMu;w z4*c4GGrT*!yx30sr7)7%F~+g2g+Cqw%PQyg@X8W#Vb7KQ#sU3|8Q87=BN6m0PXg7! zRY~dVpFk8?9rz@4%LFjQ$A{>?l_TH{O_UYw>A zu_H%e#Fl%iN*(4&$jGWDzP?fW6ekgvlfwhnXsEA0E+BBYB7BK#jgJ;QinOtmgIH#giyuGN4f@DoNKQ|+>~ z-gh5pfXuCUYjZsUiUf&Ihtu?jI@)`s7mbWg0|69bMI+>bnG?`oXK%iLx!mU(2Tmt4 z0^~a3cy8z)0zN|6HFF@~$0sJndWv~r<1q?HI>3&{xD9s72GAws<)Ipfftmya5c_if zPBAGG4=e}fR0^aEd@5c4Qv&vT5gJ;1&vpGq=(!tSn!36SoaGxlSPQWw3k$a2GH)q6 zI0$Vm-P@AEEK-Oq97s-1{uC_~{Q0vA!8@2<$H5r&w6#OZxuq2N(kd>!)3oMWECW&Fv-9A?)nJbYI-%Lkz%OLKy^TrTnsj1EQj@}!U(~83?+6`k}2)Lovu;` z-gM2(T7&GFu<{L00=d?w%NcRu0ZE@I*#Qxx!n11=nY{KhddS0Alw)6^;UM=QU-nW^ zjA)jxQOCJ%3L)XJC)kicG(4}%YSS&7!Ro!^nS z^PRmY12im#LaHNK{s=KbDqZFR$OO(iF0eYUEhHonl7+BFy2w!t7soq@R0>)E{`W;} zY(N^q65KrgqI;40g9rTC+1aJ&b)wI{c621Ll7cOfJE|jSgZw1!gITpN*5S}~n&MxY z>h`W0xRBHqZ)Rap!;YYe6Ai153IL>vit}u_Fo3lI^nU*d`mX1ApwAE!R(9ZyrD(L` zm*wRWaOCjyK_MYEAwI%wZF>FHJJ&|T81(2VvFRQod<8?O+m1#+B}jBG5mpdb|QRmuXN zKR@svl^uczf*08h4-XH5j#PZ+@9z&~&ya~}1{V4dZAb9*!ekfaH7HZK=_+cbw(3mz2J?-Y4&xJWFp>U)8TI*Sjv?59W-FborN#O11mTFr?v<@FYa$Ce!^xSF zoqZ6ASN>&r`6Nt{KdoTmduZ>X`4*9e#>T{V@AgAPf#>WuS4UK9s;dbTiG|`F4L}>& zvvF?1cwf0hcj3Jh^bgMUrDlf%vA=%yZ~&u(5~ML&l!=p*B16Nk*;oqwoYCCMV?S4E zGOetK{1q>WzNBk%5_1ftbEU|5MA zYK{_|NA@;|h*kDRf%yq;?jYR{jsr$~G-F@iPy*D*8O5XVD&R$M@akl4Ykf-#v!LLS z+^$a>tMf2*7-}N5hdEini>wG9BhucIhbB`$@&N*b!A0I?KOCY-fQ_=)BGn!WhF7jz zo3<0*{E_G*7<52NPbj@`fFEl1R`)|BM8p05kJ|@_hKT$z?e%MB0n48Hp+E^GgagE@ zy8wPh>crw@Px@H*h?58Ung^@^Mk<&>;)Mt(uV^IJ2`A1DeZ_l3(!sO>^RCJw>mgPS zj@QY_p2(dK(9tO%$-=!{dh&eIX+VR>L9ymHMow-nl;M9mubt`L6*%t5NCLQU z#bz-pp*jASuOI*aCI63iEN>%Bd`#pZ3i7CJYuE9m6YvR-Xp4)!` D>9TW5 literal 7970 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 From 29c66e6c030f7dda419aeab2c89fbd869cd62eee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE=20=7C=20Roman=20Ty?= Date: Wed, 30 Aug 2023 20:02:53 +0400 Subject: [PATCH 11/34] fix(d.ts): Update d.ts --- packages/devextreme/js/common.d.ts | 6 ------ packages/devextreme/ts/dx.all.d.ts | 1 - 2 files changed, 7 deletions(-) diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index bcbf99d40268..80a9ef21c014 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -495,12 +495,6 @@ export type Position = 'bottom' | 'left' | 'right' | 'top'; */ export type PositionAlignment = 'bottom' | 'center' | 'left' | 'left bottom' | 'left top' | 'right' | 'right bottom' | 'right top' | 'top'; -/** - * @public - * @namespace DevExpress.common - */ -export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; - /** * @docid * @public diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index 873750c57645..cbee855e170d 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -1657,7 +1657,6 @@ declare module DevExpress.common { | 'right bottom' | 'right top' | 'top'; - export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; /** * [descr:RangeRule] */ From 40df212bbc4a53afebebd2188d952299562569c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE=20=7C=20Roman=20Ty?= Date: Mon, 4 Sep 2023 12:00:41 +0400 Subject: [PATCH 12/34] rebase from TabPanel: Add iconPosition option --- packages/devextreme-angular/src/common/index.ts | 1 - packages/devextreme-react/src/common/index.ts | 1 - packages/devextreme-vue/src/common/index.ts | 1 - 3 files changed, 3 deletions(-) diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index 5b6d7fed70fd..a839f33156e8 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index 925634469d5f..bd42a4a4bb97 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index 925634469d5f..bd42a4a4bb97 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, RangeRule, RequiredRule, Scrollable, From ff0e7afe677741327088a39343020cce2de6d12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Tue, 22 Aug 2023 20:48:50 +0400 Subject: [PATCH 13/34] feat(tabs): Update TS --- packages/devextreme-angular/src/common/index.ts | 1 + packages/devextreme-react/src/common/index.ts | 1 + packages/devextreme-vue/src/common/index.ts | 1 + packages/devextreme/js/common.d.ts | 6 ++++++ packages/devextreme/ts/dx.all.d.ts | 1 + 5 files changed, 10 insertions(+) diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index a839f33156e8..5b6d7fed70fd 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index bd42a4a4bb97..925634469d5f 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index bd42a4a4bb97..925634469d5f 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index 80a9ef21c014..bcbf99d40268 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -495,6 +495,12 @@ export type Position = 'bottom' | 'left' | 'right' | 'top'; */ export type PositionAlignment = 'bottom' | 'center' | 'left' | 'left bottom' | 'left top' | 'right' | 'right bottom' | 'right top' | 'top'; +/** + * @public + * @namespace DevExpress.common + */ +export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; + /** * @docid * @public diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index cbee855e170d..873750c57645 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -1657,6 +1657,7 @@ declare module DevExpress.common { | 'right bottom' | 'right top' | 'top'; + export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; /** * [descr:RangeRule] */ From 8f588d7959a09a0863aec50ed9ee9eaf88849501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 23 Aug 2023 15:10:57 +0400 Subject: [PATCH 14/34] fix(d.ts): Rename type --- packages/devextreme-angular/src/common/index.ts | 1 - packages/devextreme-react/src/common/index.ts | 1 - packages/devextreme-vue/src/common/index.ts | 1 - packages/devextreme/js/common.d.ts | 6 ------ packages/devextreme/ts/dx.all.d.ts | 1 - 5 files changed, 10 deletions(-) diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index 5b6d7fed70fd..a839f33156e8 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index 925634469d5f..bd42a4a4bb97 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index 925634469d5f..bd42a4a4bb97 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index bcbf99d40268..80a9ef21c014 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -495,12 +495,6 @@ export type Position = 'bottom' | 'left' | 'right' | 'top'; */ export type PositionAlignment = 'bottom' | 'center' | 'left' | 'left bottom' | 'left top' | 'right' | 'right bottom' | 'right top' | 'top'; -/** - * @public - * @namespace DevExpress.common - */ -export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; - /** * @docid * @public diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index 873750c57645..cbee855e170d 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -1657,7 +1657,6 @@ declare module DevExpress.common { | 'right bottom' | 'right top' | 'top'; - export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; /** * [descr:RangeRule] */ From 910bee84762cac01877f2dab132d5e4cc05e477f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Tue, 22 Aug 2023 23:13:30 +0400 Subject: [PATCH 15/34] feat(d.ts): Update TS --- packages/devextreme/ts/dx.all.d.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index cbee855e170d..ea78e8159fe9 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -25535,6 +25535,10 @@ declare module DevExpress.ui { * [descr:dxTabPanelOptions.iconPosition] */ iconPosition?: DevExpress.common.TabsIconPosition; + /** + * [descr:dxTabPanelOptions.iconPosition] + */ + iconPosition?: DevExpress.common.PositionLogical; /** * [descr:dxTabPanelOptions.items] */ From bc1b2a708ce0d96e5aafa8ec56318df32e3a4f1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 23 Aug 2023 15:18:14 +0400 Subject: [PATCH 16/34] fix(tabPanel): Update TS --- packages/devextreme/ts/dx.all.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index ea78e8159fe9..07735782bb2f 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -25538,7 +25538,7 @@ declare module DevExpress.ui { /** * [descr:dxTabPanelOptions.iconPosition] */ - iconPosition?: DevExpress.common.PositionLogical; + iconPosition?: DevExpress.common.PositionRelative; /** * [descr:dxTabPanelOptions.items] */ From 66aea7dc8f6a4499e93edf2b72c642439e119437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Tue, 29 Aug 2023 17:59:49 +0400 Subject: [PATCH 17/34] fix(d.ts): Rename type --- packages/devextreme/ts/dx.all.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index 07735782bb2f..b4e54268ce81 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -25538,7 +25538,7 @@ declare module DevExpress.ui { /** * [descr:dxTabPanelOptions.iconPosition] */ - iconPosition?: DevExpress.common.PositionRelative; + iconPosition?: DevExpress.ui.dxTabs.IconPosition; /** * [descr:dxTabPanelOptions.items] */ From dc2d19a7de60cb230023d9c13e862302c47a1cbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 30 Aug 2023 17:51:56 +0400 Subject: [PATCH 18/34] regenerate-all --- packages/devextreme/ts/dx.all.d.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index b4e54268ce81..cbee855e170d 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -25535,10 +25535,6 @@ declare module DevExpress.ui { * [descr:dxTabPanelOptions.iconPosition] */ iconPosition?: DevExpress.common.TabsIconPosition; - /** - * [descr:dxTabPanelOptions.iconPosition] - */ - iconPosition?: DevExpress.ui.dxTabs.IconPosition; /** * [descr:dxTabPanelOptions.items] */ From 112e16f5aab54799be7f7d826c3edd71e44e0d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 23 Aug 2023 17:16:29 +0400 Subject: [PATCH 19/34] feat(tabs): Add icon position --- packages/devextreme/scss/widgets/material/tabs/_sizes.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devextreme/scss/widgets/material/tabs/_sizes.scss b/packages/devextreme/scss/widgets/material/tabs/_sizes.scss index 13f70096ce54..af2c27f3481e 100644 --- a/packages/devextreme/scss/widgets/material/tabs/_sizes.scss +++ b/packages/devextreme/scss/widgets/material/tabs/_sizes.scss @@ -18,7 +18,7 @@ $material-tab-nav-button-content-padding: null !default; $material-tab-vertical-nav-button-content-padding: null !default; @if $size == "default" { - $material-tabs-item-padding: 12px 16px !default; + $material-tabs-item-padding: 10px 16px !default; $material-tab-height: auto !default; $material-tab-min-width: 90px !default; $material-base-icon-margin: 8px !default; @@ -31,7 +31,7 @@ $material-tab-vertical-nav-button-content-padding: null !default; } @else if $size == "compact" { - $material-tabs-item-padding: 6px 12px !default; + $material-tabs-item-padding: 4px 12px !default; $material-tab-height: auto !default; $material-tab-min-width: 82px !default; $material-base-icon-margin: 8px !default; From d038069c19b78be4ae4107ab54146f524b6110d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Thu, 24 Aug 2023 11:55:29 +0400 Subject: [PATCH 20/34] revert(tabs: styles): Revert paddings --- packages/devextreme/scss/widgets/material/tabs/_sizes.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devextreme/scss/widgets/material/tabs/_sizes.scss b/packages/devextreme/scss/widgets/material/tabs/_sizes.scss index af2c27f3481e..13f70096ce54 100644 --- a/packages/devextreme/scss/widgets/material/tabs/_sizes.scss +++ b/packages/devextreme/scss/widgets/material/tabs/_sizes.scss @@ -18,7 +18,7 @@ $material-tab-nav-button-content-padding: null !default; $material-tab-vertical-nav-button-content-padding: null !default; @if $size == "default" { - $material-tabs-item-padding: 10px 16px !default; + $material-tabs-item-padding: 12px 16px !default; $material-tab-height: auto !default; $material-tab-min-width: 90px !default; $material-base-icon-margin: 8px !default; @@ -31,7 +31,7 @@ $material-tab-vertical-nav-button-content-padding: null !default; } @else if $size == "compact" { - $material-tabs-item-padding: 4px 12px !default; + $material-tabs-item-padding: 6px 12px !default; $material-tab-height: auto !default; $material-tab-min-width: 82px !default; $material-base-icon-margin: 8px !default; From 557427d5238e755526a5aa8823b1df8e7224c0a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE=20=7C=20Roman=20Ty?= Date: Wed, 30 Aug 2023 20:04:07 +0400 Subject: [PATCH 21/34] fix(d.ts): Update d.ts --- packages/devextreme-angular/src/common/index.ts | 1 + packages/devextreme-react/src/common/index.ts | 1 + packages/devextreme-vue/src/common/index.ts | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index a839f33156e8..5b6d7fed70fd 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index bd42a4a4bb97..925634469d5f 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index bd42a4a4bb97..925634469d5f 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, From 18ff775d6345ad743886c362c3dc48be1ead81de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE=20=7C=20Roman=20Ty?= Date: Mon, 4 Sep 2023 13:35:54 +0400 Subject: [PATCH 22/34] REFENERATE ALL --- packages/devextreme-angular/src/common/index.ts | 1 - packages/devextreme-react/src/common/index.ts | 1 - packages/devextreme-vue/src/common/index.ts | 1 - 3 files changed, 3 deletions(-) diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index 5b6d7fed70fd..a839f33156e8 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index 925634469d5f..bd42a4a4bb97 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index 925634469d5f..bd42a4a4bb97 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, RangeRule, RequiredRule, Scrollable, From 207d19602d904f81d41ecb20448edd5ec62f9593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Tue, 22 Aug 2023 20:48:50 +0400 Subject: [PATCH 23/34] feat(tabs): Update TS --- packages/devextreme-react/src/common/index.ts | 1 + packages/devextreme-vue/src/common/index.ts | 1 + packages/devextreme/js/common.d.ts | 6 ++++++ packages/devextreme/ts/dx.all.d.ts | 1 + 4 files changed, 9 insertions(+) diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index bd42a4a4bb97..925634469d5f 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index bd42a4a4bb97..925634469d5f 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -31,6 +31,7 @@ export { PatternRule, Position, PositionAlignment, + PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index 80a9ef21c014..bcbf99d40268 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -495,6 +495,12 @@ export type Position = 'bottom' | 'left' | 'right' | 'top'; */ export type PositionAlignment = 'bottom' | 'center' | 'left' | 'left bottom' | 'left top' | 'right' | 'right bottom' | 'right top' | 'top'; +/** + * @public + * @namespace DevExpress.common + */ +export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; + /** * @docid * @public diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index cbee855e170d..873750c57645 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -1657,6 +1657,7 @@ declare module DevExpress.common { | 'right bottom' | 'right top' | 'top'; + export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; /** * [descr:RangeRule] */ From 8b54bb0552201dcb23d57d334cfdf88f7e481702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 23 Aug 2023 15:10:57 +0400 Subject: [PATCH 24/34] fix(d.ts): Rename type --- packages/devextreme-react/src/common/index.ts | 1 - packages/devextreme-vue/src/common/index.ts | 1 - packages/devextreme/js/common.d.ts | 6 ------ packages/devextreme/ts/dx.all.d.ts | 1 - 4 files changed, 9 deletions(-) diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index 925634469d5f..bd42a4a4bb97 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index 925634469d5f..bd42a4a4bb97 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -31,7 +31,6 @@ export { PatternRule, Position, PositionAlignment, - PositionLogical, RangeRule, RequiredRule, Scrollable, diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index bcbf99d40268..80a9ef21c014 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -495,12 +495,6 @@ export type Position = 'bottom' | 'left' | 'right' | 'top'; */ export type PositionAlignment = 'bottom' | 'center' | 'left' | 'left bottom' | 'left top' | 'right' | 'right bottom' | 'right top' | 'top'; -/** - * @public - * @namespace DevExpress.common - */ -export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; - /** * @docid * @public diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index 873750c57645..cbee855e170d 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -1657,7 +1657,6 @@ declare module DevExpress.common { | 'right bottom' | 'right top' | 'top'; - export type PositionLogical = 'top' | 'end' | 'bottom' | 'start'; /** * [descr:RangeRule] */ From 09c783abe04d8e2d1b10d74afa1f89c85312684a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 23 Aug 2023 17:16:29 +0400 Subject: [PATCH 25/34] feat(tabs): Add icon position --- packages/devextreme/scss/widgets/material/tabs/_sizes.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devextreme/scss/widgets/material/tabs/_sizes.scss b/packages/devextreme/scss/widgets/material/tabs/_sizes.scss index 13f70096ce54..af2c27f3481e 100644 --- a/packages/devextreme/scss/widgets/material/tabs/_sizes.scss +++ b/packages/devextreme/scss/widgets/material/tabs/_sizes.scss @@ -18,7 +18,7 @@ $material-tab-nav-button-content-padding: null !default; $material-tab-vertical-nav-button-content-padding: null !default; @if $size == "default" { - $material-tabs-item-padding: 12px 16px !default; + $material-tabs-item-padding: 10px 16px !default; $material-tab-height: auto !default; $material-tab-min-width: 90px !default; $material-base-icon-margin: 8px !default; @@ -31,7 +31,7 @@ $material-tab-vertical-nav-button-content-padding: null !default; } @else if $size == "compact" { - $material-tabs-item-padding: 6px 12px !default; + $material-tabs-item-padding: 4px 12px !default; $material-tab-height: auto !default; $material-tab-min-width: 82px !default; $material-base-icon-margin: 8px !default; From c1fafb856b0f6c7db55417f7ae5dafe889b95792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 23 Aug 2023 16:29:20 +0400 Subject: [PATCH 26/34] stash --- packages/devextreme/playground/jquery.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/devextreme/playground/jquery.html b/packages/devextreme/playground/jquery.html index 588f8dd3c06a..0f7f8378fa70 100644 --- a/packages/devextreme/playground/jquery.html +++ b/packages/devextreme/playground/jquery.html @@ -1,5 +1,6 @@ + DevExtreme jQuery Example @@ -42,6 +43,7 @@ +

Test header

@@ -60,4 +62,5 @@

Te

- + + \ No newline at end of file From 451cf1bab61a13fffe3449c4f6e39de40f9b84b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE?= Date: Wed, 23 Aug 2023 17:16:29 +0400 Subject: [PATCH 27/34] feat(tabs): Add icon position --- packages/devextreme/playground/jquery.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/devextreme/playground/jquery.html b/packages/devextreme/playground/jquery.html index 0f7f8378fa70..588f8dd3c06a 100644 --- a/packages/devextreme/playground/jquery.html +++ b/packages/devextreme/playground/jquery.html @@ -1,6 +1,5 @@ - DevExtreme jQuery Example @@ -43,7 +42,6 @@ -

Test header

@@ -62,5 +60,4 @@

Te

- - \ No newline at end of file + From 636b68ed22635ab2d888ba4d787b8e70d706cfed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE=20=7C=20Roman=20Ty?= Date: Thu, 31 Aug 2023 16:39:56 +0400 Subject: [PATCH 28/34] Tabs: Add stylingMode option --- packages/devextreme/js/ui/tabs.js | 34 +++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/packages/devextreme/js/ui/tabs.js b/packages/devextreme/js/ui/tabs.js index d93503cc8cee..ad8a4c0f708b 100644 --- a/packages/devextreme/js/ui/tabs.js +++ b/packages/devextreme/js/ui/tabs.js @@ -57,6 +57,11 @@ const TABS_ICON_POSITION_CLASS = { start: 'dx-tabs-icon-position-start', }; +const TABS_STYLING_MODE_CLASS = { + primary: 'dx-tabs-styling-mode-primary', + secondary: 'dx-tabs-styling-mode-secondary', +}; + const TABS_ITEM_DATA_KEY = 'dxTabData'; const BUTTON_NEXT_ICON = 'chevronnext'; @@ -85,6 +90,11 @@ const ICON_POSITION = { start: 'start', }; +const STYLING_MODE = { + primary: 'primary', + secondary: 'secondary', +}; + const Tabs = CollectionWidget.inherit({ @@ -99,6 +109,7 @@ const Tabs = CollectionWidget.inherit({ selectionMode: 'single', orientation: ORIENTATION.horizontal, iconPosition: ICON_POSITION.start, + stylingMode: STYLING_MODE.primary, /** * @name dxTabsOptions.activeStateEnabled @@ -155,12 +166,15 @@ const Tabs = CollectionWidget.inherit({ ]); }, - _init: function() { + _init() { + const { orientation, stylingMode } = this.option(); + this.callBase(); this.setAria('role', 'tablist'); this.$element().addClass(TABS_CLASS); - this._toggleOrientationClass(this.option('orientation')); + this._toggleOrientationClass(orientation); this._toggleIconPositionClass(); + this._toggleStylingModeClass(stylingMode); this._renderWrapper(); this._renderMultiple(); @@ -538,7 +552,7 @@ const Tabs = CollectionWidget.inherit({ this._toggleTabsHorizontalClass(!isVertical); }, - _getTabIconPositionClass() { + _getTabsIconPositionClass() { const position = this.option('iconPosition'); switch(position) { @@ -559,7 +573,7 @@ const Tabs = CollectionWidget.inherit({ this.$element().removeClass(TABS_ICON_POSITION_CLASS[key]); } - const newClass = this._getTabIconPositionClass(); + const newClass = this._getTabsIconPositionClass(); this.$element().addClass(newClass); }, @@ -594,6 +608,14 @@ const Tabs = CollectionWidget.inherit({ this._toggleFocusedDisabledPrevClass(currentIndex, shouldPrevClassBeSetted); }, + _toggleStylingModeClass(value) { + for(const key in TABS_STYLING_MODE_CLASS) { + this.$element().removeClass(TABS_STYLING_MODE_CLASS[key]); + } + + this.$element().addClass(TABS_STYLING_MODE_CLASS[value] ?? TABS_STYLING_MODE_CLASS.primary); + }, + _optionChanged: function(args) { switch(args.name) { case 'useInkRipple': @@ -633,6 +655,10 @@ const Tabs = CollectionWidget.inherit({ this._toggleIconPositionClass(); break; } + case 'stylingMode': { + this._toggleStylingModeClass(args.value); + break; + } default: this.callBase(args); } From 38e11c9769b384fd32f008ddac1312d5d0c72ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE=20=7C=20Roman=20Ty?= Date: Thu, 31 Aug 2023 17:12:07 +0400 Subject: [PATCH 29/34] feat(tabs: QUnit): Add tests for stilingMode option and classes --- .../tests/DevExpress.ui.widgets/tabs.tests.js | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js index 4d188c198104..a6c04e206e06 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js @@ -48,6 +48,14 @@ const TABS_ICON_POSITION_CLASS = { bottom: 'dx-tabs-icon-position-bottom', start: 'dx-tabs-icon-position-start', }; +const TABS_STYLING_MODE_CLASS = { + primary: 'dx-tabs-styling-mode-primary', + secondary: 'dx-tabs-styling-mode-secondary', +}; +const STYLING_MODE = { + primary: 'primary', + secondary: 'secondary', +}; const TABS_WRAPPER_CLASS = 'dx-tabs-wrapper'; const TABS_NAV_BUTTON_CLASS = 'dx-tabs-nav-button'; const TABS_NAV_BUTTONS_CLASS = 'dx-tabs-nav-buttons'; @@ -318,6 +326,19 @@ QUnit.module('General', () => { assert.ok($element.hasClass(TABS_ICON_POSITION_CLASS[iconPosition])); }); }); + + QUnit.test('the tabs element must have a correct styling mode class', function(assert) { + const $element = $('#tabs').dxTabs({ items: [1, 2, 3] }); + const instance = $element.dxTabs('instance'); + + assert.strictEqual(instance.option('stylingMode'), STYLING_MODE.primary); + assert.strictEqual($element.hasClass(TABS_STYLING_MODE_CLASS.primary), true); + + instance.option({ stylingMode: 'secondary' }); + + assert.strictEqual(instance.option('stylingMode'), STYLING_MODE.secondary); + assert.strictEqual($element.hasClass(TABS_STYLING_MODE_CLASS.secondary), true); + }); }); QUnit.module('Tab select action', () => { From 6470bbaef0b4eae87eecbce732e26e713314911c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE=20=7C=20Roman=20Ty?= Date: Thu, 31 Aug 2023 17:22:11 +0400 Subject: [PATCH 30/34] feat(d.ts): Update d.ts --- packages/devextreme-angular/src/common/index.ts | 1 + packages/devextreme-react/src/common/index.ts | 1 + packages/devextreme-vue/src/common/index.ts | 1 + packages/devextreme/js/common.d.ts | 6 ++++++ packages/devextreme/js/ui/tabs.d.ts | 8 ++++++++ packages/devextreme/js/ui/tabs_types.d.ts | 1 + packages/devextreme/ts/dx.all.d.ts | 5 +++++ 7 files changed, 23 insertions(+) diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index a839f33156e8..93ee40ec25e0 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -51,6 +51,7 @@ export { StringLengthRule, SubmenuShowMode, TabsIconPosition, + TabsStylingMode, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index bd42a4a4bb97..3b8816fbf65a 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -51,6 +51,7 @@ export { StringLengthRule, SubmenuShowMode, TabsIconPosition, + TabsStylingMode, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index bd42a4a4bb97..3b8816fbf65a 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -51,6 +51,7 @@ export { StringLengthRule, SubmenuShowMode, TabsIconPosition, + TabsStylingMode, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index 80a9ef21c014..63b19a642370 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -710,6 +710,12 @@ export type SubmenuShowMode = 'onClick' | 'onHover'; */ export type TabsIconPosition = 'top' | 'end' | 'bottom' | 'start'; +/** + * @public + * @namespace DevExpress.common + */ +export type TabsStylingMode = 'primary' | 'secondary'; + /** * @public * @namespace DevExpress.common diff --git a/packages/devextreme/js/ui/tabs.d.ts b/packages/devextreme/js/ui/tabs.d.ts index 373f68c20a10..7ba37fe12837 100644 --- a/packages/devextreme/js/ui/tabs.d.ts +++ b/packages/devextreme/js/ui/tabs.d.ts @@ -18,6 +18,7 @@ import { Orientation, SingleOrMultiple, TabsIconPosition, + TabsStylingMode, } from '../common'; export type ItemLike = string | Item | any; @@ -26,6 +27,7 @@ export { SingleOrMultiple, Orientation, TabsIconPosition, + TabsStylingMode, }; /** @@ -191,6 +193,12 @@ export interface dxTabsBaseOptions< * @public */ showNavButtons?: boolean; + /** + * @docid dxTabsOptions.iconPosition + * @default 'start' + * @public + */ + stylingMode?: TabsStylingMode; } /** diff --git a/packages/devextreme/js/ui/tabs_types.d.ts b/packages/devextreme/js/ui/tabs_types.d.ts index b63c49ae58ad..200ccd109178 100644 --- a/packages/devextreme/js/ui/tabs_types.d.ts +++ b/packages/devextreme/js/ui/tabs_types.d.ts @@ -2,6 +2,7 @@ export { SingleOrMultiple, Orientation, TabsIconPosition, + TabsStylingMode, ContentReadyEvent, DisposingEvent, InitializedEvent, diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index cbee855e170d..8f9dd92f461e 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -1764,6 +1764,7 @@ declare module DevExpress.common { }; export type SubmenuShowMode = 'onClick' | 'onHover'; export type TabsIconPosition = 'top' | 'end' | 'bottom' | 'start'; + export type TabsStylingMode = 'primary' | 'secondary'; export type TextBoxPredefinedButton = 'clear'; /** @@ -25747,6 +25748,10 @@ declare module DevExpress.ui { * [descr:dxTabsOptions.showNavButtons] */ showNavButtons?: boolean; + /** + * [descr:dxTabsOptions.iconPosition] + */ + stylingMode?: DevExpress.common.TabsStylingMode; } /** * @deprecated Use Item instead From cda7f398741b3e0215513ccb51265b12b0ea9070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE=20=7C=20Roman=20Ty?= Date: Thu, 31 Aug 2023 18:05:59 +0400 Subject: [PATCH 31/34] feat(regenerate-all) --- .../devextreme-angular/src/ui/tabs/index.ts | 21 +++++++++++++++++++ packages/devextreme-react/src/tabs.ts | 6 ++++++ packages/devextreme-vue/src/tabs.ts | 3 +++ packages/devextreme/js/ui/tabs.d.ts | 4 ++-- packages/devextreme/ts/dx.all.d.ts | 2 +- 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/packages/devextreme-angular/src/ui/tabs/index.ts b/packages/devextreme-angular/src/ui/tabs/index.ts index f84a3359844c..cde6c1367fba 100644 --- a/packages/devextreme-angular/src/ui/tabs/index.ts +++ b/packages/devextreme-angular/src/ui/tabs/index.ts @@ -390,6 +390,19 @@ export class DxTabsComponent extends DxComponent implements OnDestroy, OnChanges } + /** + * [descr:dxTabsOptions.stylingMode] + + */ + @Input() + get stylingMode(): string { + return this._getOption('stylingMode'); + } + set stylingMode(value: string) { + this._setOption('stylingMode', value); + } + + /** * [descr:WidgetOptions.tabIndex] @@ -675,6 +688,13 @@ export class DxTabsComponent extends DxComponent implements OnDestroy, OnChanges */ @Output() showNavButtonsChange: EventEmitter; + /** + + * This member supports the internal infrastructure and is not intended to be used directly from your code. + + */ + @Output() stylingModeChange: EventEmitter; + /** * This member supports the internal infrastructure and is not intended to be used directly from your code. @@ -754,6 +774,7 @@ export class DxTabsComponent extends DxComponent implements OnDestroy, OnChanges { emit: 'selectedItemsChange' }, { emit: 'selectionModeChange' }, { emit: 'showNavButtonsChange' }, + { emit: 'stylingModeChange' }, { emit: 'tabIndexChange' }, { emit: 'visibleChange' }, { emit: 'widthChange' } diff --git a/packages/devextreme-react/src/tabs.ts b/packages/devextreme-react/src/tabs.ts index e336dc5ec20d..776f20395106 100644 --- a/packages/devextreme-react/src/tabs.ts +++ b/packages/devextreme-react/src/tabs.ts @@ -129,6 +129,12 @@ class Tabs extends BaseComponent Date: Tue, 5 Sep 2023 19:02:42 +0400 Subject: [PATCH 32/34] fix(tabs): Fix paddings --- packages/devextreme/scss/widgets/material/tabs/_sizes.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devextreme/scss/widgets/material/tabs/_sizes.scss b/packages/devextreme/scss/widgets/material/tabs/_sizes.scss index af2c27f3481e..13f70096ce54 100644 --- a/packages/devextreme/scss/widgets/material/tabs/_sizes.scss +++ b/packages/devextreme/scss/widgets/material/tabs/_sizes.scss @@ -18,7 +18,7 @@ $material-tab-nav-button-content-padding: null !default; $material-tab-vertical-nav-button-content-padding: null !default; @if $size == "default" { - $material-tabs-item-padding: 10px 16px !default; + $material-tabs-item-padding: 12px 16px !default; $material-tab-height: auto !default; $material-tab-min-width: 90px !default; $material-base-icon-margin: 8px !default; @@ -31,7 +31,7 @@ $material-tab-vertical-nav-button-content-padding: null !default; } @else if $size == "compact" { - $material-tabs-item-padding: 4px 12px !default; + $material-tabs-item-padding: 6px 12px !default; $material-tab-height: auto !default; $material-tab-min-width: 82px !default; $material-base-icon-margin: 8px !default; From aeafbb1443d3a5668b717c88ad9695e389543154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE=20=7C=20Roman=20Ty?= Date: Wed, 6 Sep 2023 00:01:37 +0400 Subject: [PATCH 33/34] fix(tabs: QUnit): Add tests --- .../testing/tests/DevExpress.ui.widgets/tabs.tests.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js index a6c04e206e06..4ff8f81cc7e1 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets/tabs.tests.js @@ -333,11 +333,13 @@ QUnit.module('General', () => { assert.strictEqual(instance.option('stylingMode'), STYLING_MODE.primary); assert.strictEqual($element.hasClass(TABS_STYLING_MODE_CLASS.primary), true); + assert.strictEqual($element.hasClass(TABS_STYLING_MODE_CLASS.secondary), false); instance.option({ stylingMode: 'secondary' }); assert.strictEqual(instance.option('stylingMode'), STYLING_MODE.secondary); assert.strictEqual($element.hasClass(TABS_STYLING_MODE_CLASS.secondary), true); + assert.strictEqual($element.hasClass(TABS_STYLING_MODE_CLASS.primary), false); }); }); From 7dab7141dd3d8731c9f96e03c5fb2eb3f6dcbff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marker=20dao=20=C2=AE=20=7C=20Roman=20Ty?= Date: Thu, 7 Sep 2023 13:27:35 +0400 Subject: [PATCH 34/34] fix(d.ts): Rename type --- packages/devextreme-angular/src/common/index.ts | 2 +- packages/devextreme-react/src/common/index.ts | 2 +- packages/devextreme-vue/src/common/index.ts | 2 +- packages/devextreme/js/common.d.ts | 2 +- packages/devextreme/js/ui/tabs.d.ts | 6 +++--- packages/devextreme/js/ui/tabs_types.d.ts | 2 +- packages/devextreme/ts/dx.all.d.ts | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/devextreme-angular/src/common/index.ts b/packages/devextreme-angular/src/common/index.ts index 93ee40ec25e0..8bf03d75991c 100644 --- a/packages/devextreme-angular/src/common/index.ts +++ b/packages/devextreme-angular/src/common/index.ts @@ -51,7 +51,7 @@ export { StringLengthRule, SubmenuShowMode, TabsIconPosition, - TabsStylingMode, + TabsStyle, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, diff --git a/packages/devextreme-react/src/common/index.ts b/packages/devextreme-react/src/common/index.ts index 3b8816fbf65a..83397af54a21 100644 --- a/packages/devextreme-react/src/common/index.ts +++ b/packages/devextreme-react/src/common/index.ts @@ -51,7 +51,7 @@ export { StringLengthRule, SubmenuShowMode, TabsIconPosition, - TabsStylingMode, + TabsStyle, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, diff --git a/packages/devextreme-vue/src/common/index.ts b/packages/devextreme-vue/src/common/index.ts index 3b8816fbf65a..83397af54a21 100644 --- a/packages/devextreme-vue/src/common/index.ts +++ b/packages/devextreme-vue/src/common/index.ts @@ -51,7 +51,7 @@ export { StringLengthRule, SubmenuShowMode, TabsIconPosition, - TabsStylingMode, + TabsStyle, TextBoxPredefinedButton, TextEditorButton, TextEditorButtonLocation, diff --git a/packages/devextreme/js/common.d.ts b/packages/devextreme/js/common.d.ts index 63b19a642370..864995683650 100644 --- a/packages/devextreme/js/common.d.ts +++ b/packages/devextreme/js/common.d.ts @@ -714,7 +714,7 @@ export type TabsIconPosition = 'top' | 'end' | 'bottom' | 'start'; * @public * @namespace DevExpress.common */ -export type TabsStylingMode = 'primary' | 'secondary'; +export type TabsStyle = 'primary' | 'secondary'; /** * @public diff --git a/packages/devextreme/js/ui/tabs.d.ts b/packages/devextreme/js/ui/tabs.d.ts index 12fbb83d53d4..0f3f91b30c33 100644 --- a/packages/devextreme/js/ui/tabs.d.ts +++ b/packages/devextreme/js/ui/tabs.d.ts @@ -18,7 +18,7 @@ import { Orientation, SingleOrMultiple, TabsIconPosition, - TabsStylingMode, + TabsStyle, } from '../common'; export type ItemLike = string | Item | any; @@ -27,7 +27,7 @@ export { SingleOrMultiple, Orientation, TabsIconPosition, - TabsStylingMode, + TabsStyle, }; /** @@ -198,7 +198,7 @@ export interface dxTabsBaseOptions< * @default 'primary' * @public */ - stylingMode?: TabsStylingMode; + stylingMode?: TabsStyle; } /** diff --git a/packages/devextreme/js/ui/tabs_types.d.ts b/packages/devextreme/js/ui/tabs_types.d.ts index 200ccd109178..5e5540da6550 100644 --- a/packages/devextreme/js/ui/tabs_types.d.ts +++ b/packages/devextreme/js/ui/tabs_types.d.ts @@ -2,7 +2,7 @@ export { SingleOrMultiple, Orientation, TabsIconPosition, - TabsStylingMode, + TabsStyle, ContentReadyEvent, DisposingEvent, InitializedEvent, diff --git a/packages/devextreme/ts/dx.all.d.ts b/packages/devextreme/ts/dx.all.d.ts index cc259945000b..a5a7ee0e1efd 100644 --- a/packages/devextreme/ts/dx.all.d.ts +++ b/packages/devextreme/ts/dx.all.d.ts @@ -1764,7 +1764,7 @@ declare module DevExpress.common { }; export type SubmenuShowMode = 'onClick' | 'onHover'; export type TabsIconPosition = 'top' | 'end' | 'bottom' | 'start'; - export type TabsStylingMode = 'primary' | 'secondary'; + export type TabsStyle = 'primary' | 'secondary'; export type TextBoxPredefinedButton = 'clear'; /** @@ -25751,7 +25751,7 @@ declare module DevExpress.ui { /** * [descr:dxTabsOptions.stylingMode] */ - stylingMode?: DevExpress.common.TabsStylingMode; + stylingMode?: DevExpress.common.TabsStyle; } /** * @deprecated Use Item instead