From 4cd9557b1ae5c1b9e68b4fddbc4fd87f544ea6ca Mon Sep 17 00:00:00 2001 From: Danil Khaliulin Date: Fri, 28 Aug 2026 19:10:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=D0=B7=D0=B0=D0=B4=D0=B0=D1=82=D1=8C=20?= =?UTF-8?q?=D1=88=D0=B8=D1=80=D0=B8=D0=BD=D1=83=20drawer=20=D0=BF=D0=BE=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D0=B0=D0=BC:=20sm=20280,?= =?UTF-8?q?=20base=20350,=20lg=20420,=20xlg=20630?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prime-preset/tokens/components/drawer.ts | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/lib/providers/prime-preset/tokens/components/drawer.ts b/src/lib/providers/prime-preset/tokens/components/drawer.ts index 2ddbe8c7..b7820aad 100644 --- a/src/lib/providers/prime-preset/tokens/components/drawer.ts +++ b/src/lib/providers/prime-preset/tokens/components/drawer.ts @@ -29,13 +29,30 @@ export const drawerCss = ({ dt }: { dt: (token: string) => string }): string => padding: 0 ${dt('dimension.space.600')} ${dt('dimension.space.600')} ${dt('dimension.space.600')}; } +/* Ширина панели: в экспорте у drawer одна ширина, поэтому размеры берём с той же ступени + примитивов, что рисует Figma (коллекция sizing, width: 280 / 350 / 420 / 630) */ .p-drawer.p-component.p-drawer-left, .p-drawer.p-component.p-drawer-right { margin: ${dt('drawer.extend.margin')}; - width: ${dt('drawer.extend.width')}; + width: ${dt('sizing.175x')}; height: calc(100% - ${dt('drawer.extend.margin')} * 2); } +.p-drawer.p-component.p-drawer-left.p-drawer-sm, +.p-drawer.p-component.p-drawer-right.p-drawer-sm { + width: ${dt('sizing.140x')}; +} + +.p-drawer.p-component.p-drawer-left.p-drawer-lg, +.p-drawer.p-component.p-drawer-right.p-drawer-lg { + width: ${dt('sizing.210x')}; +} + +.p-drawer.p-component.p-drawer-left.p-drawer-xlg, +.p-drawer.p-component.p-drawer-right.p-drawer-xlg { + width: ${dt('sizing.315x')}; +} + .p-drawer.p-component.p-drawer-top, .p-drawer.p-component.p-drawer-bottom { margin: ${dt('drawer.extend.margin')}; From a3ab7c9de088428384434c2b65ac0f8f00d2d757 Mon Sep 17 00:00:00 2001 From: Danil Khaliulin Date: Fri, 28 Aug 2026 19:22:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D1=82=D1=8C?= =?UTF-8?q?=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D1=83=D1=8E=20=D1=88=D0=B8?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D1=83=20drawer=20=D0=BD=D0=B0=20=D1=82=D0=BE?= =?UTF-8?q?=D0=BA=D0=B5=D0=BD=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=20extend.width?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lib/providers/prime-preset/tokens/components/drawer.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/providers/prime-preset/tokens/components/drawer.ts b/src/lib/providers/prime-preset/tokens/components/drawer.ts index b7820aad..c9d1bbcf 100644 --- a/src/lib/providers/prime-preset/tokens/components/drawer.ts +++ b/src/lib/providers/prime-preset/tokens/components/drawer.ts @@ -29,12 +29,12 @@ export const drawerCss = ({ dt }: { dt: (token: string) => string }): string => padding: 0 ${dt('dimension.space.600')} ${dt('dimension.space.600')} ${dt('dimension.space.600')}; } -/* Ширина панели: в экспорте у drawer одна ширина, поэтому размеры берём с той же ступени - примитивов, что рисует Figma (коллекция sizing, width: 280 / 350 / 420 / 630) */ +/* Ширина панели: base приходит токеном компонента, а для sm/lg/xlg ветки в экспорте нет — + значения берём с той же ступени примитивов, что рисует Figma (sizing, width: 280 / 420 / 630) */ .p-drawer.p-component.p-drawer-left, .p-drawer.p-component.p-drawer-right { margin: ${dt('drawer.extend.margin')}; - width: ${dt('sizing.175x')}; + width: ${dt('drawer.extend.width')}; height: calc(100% - ${dt('drawer.extend.margin')} * 2); } From d0458f6273e6ced59c05b74ab30c65b004033927 Mon Sep 17 00:00:00 2001 From: Danil Khaliulin Date: Fri, 28 Aug 2026 19:48:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=D0=BF=D1=80=D0=B8=D0=B2=D1=8F=D0=B7=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20=D1=88=D0=B8=D1=80=D0=B8=D0=BD=D1=8B=20drawer=20?= =?UTF-8?q?=D0=BA=20=D1=81=D0=B5=D0=BC=D0=B0=D0=BD=D1=82=D0=B8=D1=87=D0=B5?= =?UTF-8?q?=D1=81=D0=BA=D0=BE=D0=B9=20=D1=88=D0=BA=D0=B0=D0=BB=D0=B5=20?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D0=BE=D0=B2=20=D0=B8=20?= =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20=D1=81=D1=82?= =?UTF-8?q?=D1=83=D0=BF=D0=B5=D0=BD=D1=8C=20630?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../prime-preset/tokens/components/drawer.ts | 12 ++++++------ src/lib/providers/prime-preset/tokens/tokens.json | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/lib/providers/prime-preset/tokens/components/drawer.ts b/src/lib/providers/prime-preset/tokens/components/drawer.ts index c9d1bbcf..ab86947d 100644 --- a/src/lib/providers/prime-preset/tokens/components/drawer.ts +++ b/src/lib/providers/prime-preset/tokens/components/drawer.ts @@ -29,28 +29,28 @@ export const drawerCss = ({ dt }: { dt: (token: string) => string }): string => padding: 0 ${dt('dimension.space.600')} ${dt('dimension.space.600')} ${dt('dimension.space.600')}; } -/* Ширина панели: base приходит токеном компонента, а для sm/lg/xlg ветки в экспорте нет — - значения берём с той же ступени примитивов, что рисует Figma (sizing, width: 280 / 420 / 630) */ +/* Ширина панели по размерам: drawer.extend.overlayWidth — ступени семантической шкалы + dimension.size (макет просит 280 / 350 / 420 / 630, ближайшие ступени дают 272 / 336 / 400 / 630) */ .p-drawer.p-component.p-drawer-left, .p-drawer.p-component.p-drawer-right { margin: ${dt('drawer.extend.margin')}; - width: ${dt('drawer.extend.width')}; + width: ${dt('drawer.extend.overlayWidth.base')}; height: calc(100% - ${dt('drawer.extend.margin')} * 2); } .p-drawer.p-component.p-drawer-left.p-drawer-sm, .p-drawer.p-component.p-drawer-right.p-drawer-sm { - width: ${dt('sizing.140x')}; + width: ${dt('drawer.extend.overlayWidth.sm')}; } .p-drawer.p-component.p-drawer-left.p-drawer-lg, .p-drawer.p-component.p-drawer-right.p-drawer-lg { - width: ${dt('sizing.210x')}; + width: ${dt('drawer.extend.overlayWidth.lg')}; } .p-drawer.p-component.p-drawer-left.p-drawer-xlg, .p-drawer.p-component.p-drawer-right.p-drawer-xlg { - width: ${dt('sizing.315x')}; + width: ${dt('drawer.extend.overlayWidth.xlg')}; } .p-drawer.p-component.p-drawer-top, diff --git a/src/lib/providers/prime-preset/tokens/tokens.json b/src/lib/providers/prime-preset/tokens/tokens.json index 363335f8..3be83fa6 100644 --- a/src/lib/providers/prime-preset/tokens/tokens.json +++ b/src/lib/providers/prime-preset/tokens/tokens.json @@ -1054,6 +1054,7 @@ "1800": "{sizing.152x}", "1900": "{sizing.168x}", "2000": "{sizing.200x}", + "2200": "{sizing.315x}", "max": "{sizing.max}" }, "borderRadius": { @@ -2942,6 +2943,12 @@ "borderRadius": "{dimension.borderRadius.200}", "borderWidth": "{dimension.borderWidth.100}", "width": "{dimension.size.2000}", + "overlayWidth": { + "sm": "{dimension.size.1700}", + "base": "{dimension.size.1900}", + "lg": "{dimension.size.2000}", + "xlg": "{dimension.size.2200}" + }, "extHeader": { "gap": "{dimension.space.200}", "borderColor": "{color.border.neutral.strong}"