diff --git a/src/controls/border-color-control.tsx b/src/controls/border-color-control.tsx index ce1d051..ddaa41c 100644 --- a/src/controls/border-color-control.tsx +++ b/src/controls/border-color-control.tsx @@ -39,10 +39,10 @@ type Props = { help?: string; onChange: ( event: any ) => void; values: { - top?: Property.BorderTopColor; - right?: Property.BorderRightColor; - bottom?: Property.BorderBottomColor; - left?: Property.BorderLeftColor; + top?: Property.Color; + right?: Property.Color; + bottom?: Property.Color; + left?: Property.Color; }; }; diff --git a/src/controls/color-control.tsx b/src/controls/color-control.tsx index e332104..e8d7ba6 100644 --- a/src/controls/color-control.tsx +++ b/src/controls/color-control.tsx @@ -18,8 +18,8 @@ import { FlexItem, Popover, ColorPalette, - __experimentalVStack as VStack, __experimentalSpacer as Spacer, + __experimentalVStack as VStack, __experimentalText as Text, } from '@wordpress/components'; import { store as blockEditorStore } from '@wordpress/block-editor'; diff --git a/src/settings/global-settings/setting-modal.tsx b/src/settings/global-settings/setting-modal.tsx index 6d2f1ec..6da94bf 100644 --- a/src/settings/global-settings/setting-modal.tsx +++ b/src/settings/global-settings/setting-modal.tsx @@ -24,6 +24,7 @@ import { __experimentalSpacer as Spacer, __experimentalHStack as HStack, __experimentalVStack as VStack, + __experimentalHeading as Heading, __experimentalUnitControl as UnitControl, __experimentalUseCustomUnits as useCustomUnits, __experimentalToggleGroupControl as ToggleGroupControl, @@ -192,585 +193,600 @@ export default function SettingModal( { options, isAdministrator, setIsSettingMo className="ftb-global-setting-modal" onRequestClose={ () => setIsSettingModalOpen( false ) } > - { isWaiting && ( -
}
+ ) }
+ value={ currentOptions.block_style?.cell_text_color_th }
+ onChange={ ( value ) => {
+ setCurrentOptions( {
+ ...currentOptions,
+ block_style: {
+ ...currentOptions.block_style,
+ cell_text_color_th: value,
+ },
+ } );
+ } }
+ />
+
}
+ ) }
+ value={ currentOptions.block_style?.cell_text_color_td }
+ onChange={ ( value ) => {
+ setCurrentOptions( {
+ ...currentOptions,
+ block_style: {
+ ...currentOptions.block_style,
+ cell_text_color_td: value,
+ },
+ } );
+ } }
+ />
+
}
+ ) }
+ value={ currentOptions.block_style?.cell_background_color_th }
+ onChange={ ( value ) => {
+ setCurrentOptions( {
+ ...currentOptions,
+ block_style: {
+ ...currentOptions.block_style,
+ cell_background_color_th: value,
+ },
+ } );
+ } }
+ />
+
}
+ ) }
+ value={ currentOptions.block_style?.cell_background_color_td }
+ onChange={ ( value ) => {
+ setCurrentOptions( {
+ ...currentOptions,
+ block_style: {
+ ...currentOptions.block_style,
+ cell_background_color_td: value,
+ },
+ } );
+ } }
+ />
+
}
- ) }
- value={ currentOptions.block_style?.cell_text_color_th }
- onChange={ ( value ) => {
- setCurrentOptions( {
- ...currentOptions,
- block_style: {
- ...currentOptions.block_style,
- cell_text_color_th: value,
- },
- } );
- } }
- />
-
}
- ) }
- value={ currentOptions.block_style?.cell_text_color_td }
- onChange={ ( value ) => {
- setCurrentOptions( {
- ...currentOptions,
- block_style: {
- ...currentOptions.block_style,
- cell_text_color_td: value,
- },
- } );
- } }
- />
-
}
- ) }
- value={ currentOptions.block_style?.cell_background_color_th }
- onChange={ ( value ) => {
- setCurrentOptions( {
- ...currentOptions,
- block_style: {
- ...currentOptions.block_style,
- cell_background_color_th: value,
- },
- } );
- } }
- />
-
}
- ) }
- value={ currentOptions.block_style?.cell_background_color_td }
- onChange={ ( value ) => {
- setCurrentOptions( {
- ...currentOptions,
- block_style: {
- ...currentOptions.block_style,
- cell_background_color_td: value,
- },
- } );
- } }
- />
-