Skip to content

Commit

Permalink
Revert "Revert "Misc Fixes""
Browse files Browse the repository at this point in the history
This reverts commit 3cff95e.
  • Loading branch information
sneridagh committed Oct 24, 2024
1 parent 1ec5f7e commit 4c494c6
Show file tree
Hide file tree
Showing 4 changed files with 152 additions and 16 deletions.
6 changes: 5 additions & 1 deletion packages/volto-light-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,16 @@
"devDependencies": {
"@plone/scripts": "^3.6.2",
"@plone/types": "workspace:*",
"@types/jest": "^29.5.8",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"react-redux": "8.1.2",
"react-router-dom": "5.2.0",
"release-it": "^17.7.0"
},
"dependencies": {
"@plone/components": "workspace:*"
"@plone/components": "workspace:*",
"uuid": "^10.0.0"
},
"peerDependencies": {
"@eeacms/volto-accordion-block": "^10.4.6",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { defineMessages, useIntl } from 'react-intl';
import ButtonsWidget, { ButtonsWidgetProps } from './ButtonsWidget';
import ButtonsWidget, { type ButtonsWidgetProps } from './ButtonsWidget';
import imageFitSVG from '@plone/volto/icons/image-fit.svg';
import imageLeftSVG from '@plone/volto/icons/image-left.svg';
import imageRightSVG from '@plone/volto/icons/image-right.svg';
Expand Down Expand Up @@ -51,7 +51,7 @@ const DEFAULT_ACTIONS = [
},
];

const BlockAlignmentWidget: React.FC<ButtonsWidgetProps> = (props) => {
const BlockAlignmentWidget = (props: ButtonsWidgetProps) => {
const intl = useIntl();

const { actions = DEFAULT_ACTIONS, actionsInfoMap, filterActions } = props;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { defineMessages, useIntl } from 'react-intl';
import ButtonsWidget, { ButtonsWidgetProps } from './ButtonsWidget';
import ButtonsWidget, { type ButtonsWidgetProps } from './ButtonsWidget';
import imageFitSVG from '@plone/volto/icons/image-fit.svg';
import imageNarrowSVG from '@plone/volto/icons/image-narrow.svg';
import imageWideSVG from '@plone/volto/icons/image-wide.svg';
Expand Down Expand Up @@ -64,7 +64,7 @@ const DEFAULT_ACTIONS = [
},
];

const BlockWidthWidget: React.FC<ButtonsWidgetProps> = (props) => {
const BlockWidthWidget = (props: ButtonsWidgetProps) => {
const intl = useIntl();

const { actions = DEFAULT_ACTIONS, actionsInfoMap, filterActions } = props;
Expand Down
154 changes: 143 additions & 11 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4c494c6

Please sign in to comment.