From eff5871147c1c0c26d690d29cd08ad2cfe85bab6 Mon Sep 17 00:00:00 2001 From: ad1992 Date: Thu, 28 Oct 2021 21:59:50 +0530 Subject: [PATCH] Add more redacted fonts --- public/fonts.css | 15 ++++- public/redacted-regular.woff2 | Bin 0 -> 2272 bytes public/redacted-script-bold.woff2 | Bin 0 -> 3892 bytes src/actions/actionProperties.tsx | 91 +++++++++++++----------------- src/components/FontList.tsx | 53 +++++++++++++++++ src/components/LayerUI.tsx | 1 + src/constants.ts | 8 ++- 7 files changed, 112 insertions(+), 56 deletions(-) create mode 100644 public/redacted-regular.woff2 create mode 100644 public/redacted-script-bold.woff2 create mode 100644 src/components/FontList.tsx diff --git a/public/fonts.css b/public/fonts.css index a2cd4e86f..33a1f3e41 100644 --- a/public/fonts.css +++ b/public/fonts.css @@ -13,7 +13,19 @@ } @font-face { - font-family: "Redacted"; + font-family: "REDACTED_REGULAR"; + src: url("redacted-regular.woff2"); + font-display: swap; +} + +@font-face { + font-family: "REDACTED_SCRIPT_BOLD"; + src: url("redacted-script-bold.woff2"); + font-display: swap; +} + +@font-face { + font-family: "REDACTED_SCRIPT_REGULAR"; src: url("redacted-script-regular.woff2"); font-display: swap; } @@ -27,4 +39,5 @@ @font-face { font-family: "Blokk"; src: url("BLOKKNeue-Regular.woff2"); + font-display: swap; } diff --git a/public/redacted-regular.woff2 b/public/redacted-regular.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..86eacb55adf02d6c31f0dbd0326ce018dcd18601 GIT binary patch literal 2272 zcmV<62p{)%Pew8T0RR9100`g!5dZ)H07H}j00?;i0RTb(00000000000000000000 z0000#Mn+Uk92y=5U;u+s2nq>=Wf2Gp-W<#_0X7081BV_9gHiwlAO(tI2ZcxsNk4aG zVrB*#r8mePk|dBo0R^2wf;*H&#l!RK_|APZUtDR{h*X1=!6+u732C!fp|%diKhK}~ z=N3@9?WV6zTq!F3QZ7*IXmkearjwKpvH9O$_+9nKnMnXGU7dL<&Fc;-^7)JGItkd=Mw(!CsI0}!%F*qLca5nD5 z2beK&|NfJP0Vr&VI+R<$^*91Yt7q}zkcK~T*?@|N|JrfGaoKUfao%ypaneB?yB#we z86Pgc{>t?;f!eMoM5(%wktVMR{KbMSFDWf6uc)l5uBol74-5(p2@MO6h>T)Hj~F=$ zGh?XOxcG#`q+}MG!{zY>!j#ms^o-1`?3~=Z`~s0!B9#>u6_=Ejl~+_&RoB$k)i*RY zHPiBz*0%PJ&d~~(y=&h5lht@F8M9a_s2wlPAueId>k6%Qc2~ zW48`;e`@W5xhKE`R&4}&9@cMzJ$I+6`T*Fl{k?MftksvVJbV87&5M_(;L<(#D_$fib+z1XqZ2X$|usFntU0z2QQgS94#F=e~z(iC-Gwp0Shq$nt z4Z)63KN(3G6FTTZ5o>b`z13OOs1S+ zO9<+qvj8u_k^&e3OlB$GZ2Y({avxX)kGQkiXpD=gB1IRbv0B+2FiKyptdfasxY$;f zL)oy6>Pkr+Ih2Src4&}N5s@aw;)x%Zs(H^Nm`nzKZW{x(L0%~)&?pvR*2(i{Q}}tu zLsFP7uV*j`lGC={6fUJ~6tS?#LL`x(@{<9e;y}%?MjD2wqbVgOK#gW7JS3OH z6rwtM2r%g~$q>Q_$`h<2k(y{eTqv6qa1;SMi37+!R)If#RbK${3V02&%kGtOPV+LX;%~*BKc8N9h~sntN-w z>%hZc9@_cd^!?fqxCRua9qshUDQSZ~+0B6dLx6zH~ zVOGH4lSb-|k~#szaS#pC3*Z@u2>|A?hIX>Z-Ek4WASZ9MFQ+n>gjKdV2>MAQH}N%R zkyqe?3=tRVH8J3%)-9ar<|57&KF1}lgj;&4`oQ8cz2Y)1*FL_LSAcHv!c`WgL|ko9 znvH9sa5{-=4ar{ON5XO+{1`uv!B0Rw)$A#sU45NF>%0S``VAPz$UsNW3`?Yv1QX&D zNWmslN?)xosdF1B^uekqnCY4D%|dXW`nHSc^inYB!KKo#7e-4FLnW!Bp{AfB5I}M! z9g7|cMgm-X5#w@Tqvsra6WSeSplJFoX=Gy1Kd2@QX^r}!b!V+676`NsXeb4x9vVq< zh!BWb^n^ZEMp;}L_*%(c3f(l-LuqmKFi;W_l4ebnDTPoLOr}s1x&I2)YE&vzrC}H| zRq2PB87Zh~SSySg#Z)3ugI-KuxXagu3a5HzW&>O{oWqbIhNo1J7PdlWdkb*7g)9(roz%-d>OK(5;%$!Lwcbon#N4QqB52y%TjWX zg@I8G>Ujo#z<*yt2mRuI0g)n;$(1Nord)+eRjSpfRi|E{Ai+X}3KK3uq$mv0Mi^-n zj41{sR-AYV5+zB-!p6bH6Ldd>Qlv_gE<>g)*>dE{ldph?n1u8MoT^B%5~a$Nt5B)I z$!J}xPW_*uQIlpgxfZS3wCm7mG)1_$Xr@`tS>;Q!Ei&Imd+i8Ud%ZTp@^FhX2dp;N z74O5t8TEPH zo-PL6diChDMZZA<8}<@gm|2bSwXwz_00016YZhey literal 0 HcmV?d00001 diff --git a/public/redacted-script-bold.woff2 b/public/redacted-script-bold.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..bfa1d2aeb5185eef133b30475567eff6f466f890 GIT binary patch literal 3892 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 Ck!GR* literal 0 HcmV?d00001 diff --git a/src/actions/actionProperties.tsx b/src/actions/actionProperties.tsx index 5b6cfa5a1..8e4bedc31 100644 --- a/src/actions/actionProperties.tsx +++ b/src/actions/actionProperties.tsx @@ -13,9 +13,9 @@ import { FillCrossHatchIcon, FillHachureIcon, FillSolidIcon, - FontFamilyCodeIcon, - FontFamilyHandDrawnIcon, - FontFamilyNormalIcon, + // FontFamilyCodeIcon, + // FontFamilyHandDrawnIcon, + // FontFamilyNormalIcon, FontSizeExtraLargeIcon, FontSizeLargeIcon, FontSizeMediumIcon, @@ -30,12 +30,11 @@ import { TextAlignCenterIcon, TextAlignLeftIcon, TextAlignRightIcon, - FontFamilyWireframeIcon, } from "../components/icons"; import { DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE, - FONT_FAMILY, + //FONT_FAMILY, } from "../constants"; import { getNonDeletedElements, @@ -49,7 +48,7 @@ import { ExcalidrawElement, ExcalidrawLinearElement, ExcalidrawTextElement, - FontFamilyValues, + //FontFamilyValues, TextAlign, } from "../element/types"; import { getLanguage, t } from "../i18n"; @@ -63,6 +62,7 @@ import { } from "../scene"; import { hasStrokeColor } from "../scene/comparisons"; import { register } from "./register"; +import FontsList from "../components/FontList"; const changeProperty = ( elements: readonly ExcalidrawElement[], @@ -507,56 +507,43 @@ export const actionChangeFontFamily = register({ }; }, PanelComponent: ({ elements, appState, updateData }) => { - const options: { - value: FontFamilyValues; - text: string; - icon: JSX.Element; - }[] = [ - { - value: FONT_FAMILY.Virgil, - text: t("labels.handDrawn"), - icon: , - }, - { - value: FONT_FAMILY.Helvetica, - text: t("labels.normal"), - icon: , - }, - { - value: FONT_FAMILY.Cascadia, - text: t("labels.code"), - icon: , - }, - { - value: FONT_FAMILY.REDACTED, - text: t("labels.wireframe"), - icon: , - }, - { - value: FONT_FAMILY.SCRIBBLE, - text: t("labels.wireframe"), - icon: , - }, - { - value: FONT_FAMILY.BLOKK, - text: t("labels.wireframe"), - icon: , - }, - ]; + // const options: { + // value: FontFamilyValues; + // text: string; + // icon: JSX.Element; + // }[] = [ + // { + // value: FONT_FAMILY.Virgil, + // text: t("labels.handDrawn"), + // icon: , + // }, + // { + // value: FONT_FAMILY.Helvetica, + // text: t("labels.normal"), + // icon: , + // }, + // { + // value: FONT_FAMILY.Cascadia, + // text: t("labels.code"), + // icon: , + // }, + // ]; return (
{t("labels.fontFamily")} - - group="font-family" - options={options} - value={getFormValue( - elements, - appState, - (element) => isTextElement(element) && element.fontFamily, - appState.currentItemFontFamily || DEFAULT_FONT_FAMILY, - )} - onChange={(value) => updateData(value)} + { + updateData(val); + }} + currentFontFamily={ + getFormValue( + elements, + appState, + (element) => isTextElement(element) && element.fontFamily, + appState.currentItemFontFamily || DEFAULT_FONT_FAMILY, + ) || DEFAULT_FONT_FAMILY + } />
); diff --git a/src/components/FontList.tsx b/src/components/FontList.tsx new file mode 100644 index 000000000..37e51a2c2 --- /dev/null +++ b/src/components/FontList.tsx @@ -0,0 +1,53 @@ +import { FONT_FAMILY } from "../constants"; +import { FontFamilyValues } from "../element/types"; + +const FontsList = ({ + onChange, + currentFontFamily, +}: { + onChange: (val: FontFamilyValues) => void; + currentFontFamily: FontFamilyValues; +}) => { + return ( + + ); +}; + +export default FontsList; diff --git a/src/components/LayerUI.tsx b/src/components/LayerUI.tsx index c958abf77..5bc1920d9 100644 --- a/src/components/LayerUI.tsx +++ b/src/components/LayerUI.tsx @@ -725,6 +725,7 @@ const LayerUI = ({ > {renderCustomFooter?.(false, appState)} +