Allow reset controls, fix animation props type, remove get_icons_html…

… function
blockifywp · Nov 21, 2023 · 436f039 · 436f039
1 parent 9c32774
commit 436f039
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 39 deletions.
diff --git a/includes/utility/icon.php b/includes/utility/icon.php
@@ -230,34 +230,3 @@ function get_icon( string $set, string $name, $size = null ): string {
 
 	return trim( $dom->saveHTML() );
 }
-
-/**
- * Renders all icon SVGs on front end.
- *
- * @since 1.2.9
- *
- * @param int    $size Icon size.
- * @param string $set  Icon set.
- *
- * @return string
- */
-function get_icons_html( string $set = '', int $size = 20 ): string {
-	$icon_sets = get_icons();
-
-	if ( $set ) {
-		$icon_sets = [
-			$set => $icon_sets[ $set ] ?? [],
-		];
-	}
-
-	$html = '';
-
-	foreach ( $icon_sets as $set => $icons ) {
-		foreach ( $icons as $name => $icon ) {
-			$html .= get_icon( $set, $name, $size );
-		}
-	}
-
-	return $html;
-}
-
diff --git a/src/block-extensions/animation.tsx b/src/block-extensions/animation.tsx
@@ -79,7 +79,7 @@ addFilter(
 	0
 );
 
-const getStyles = ( animation: style ): CSSProperties => {
+const getStyles = ( animation: cssAnimation ): CSSProperties => {
 	const styles: {
 		'--animation-event'?: string;
 		animationName?: string;
@@ -114,7 +114,7 @@ const getStyles = ( animation: style ): CSSProperties => {
 
 	if ( animation?.timingFunction ) {
 		styles.animationTimingFunction =
-			animation?.timingFunction ?? 'ease-in-out';
+            animation?.timingFunction ?? 'ease-in-out';
 	}
 
 	if ( ! styles?.animationIterationCount ) {
@@ -134,7 +134,7 @@ addFilter(
 	createHigherOrderComponent( ( BlockListBlock ) => {
 		return ( props: blockProps ) => {
 			const { attributes } = props;
-			const animation: style = attributes?.animation ?? {};
+			const animation: cssAnimation = attributes?.animation ?? {};
 
 			if ( ! animation || ! Object?.keys( animation )?.length ) {
 				return <BlockListBlock { ...props } />;
@@ -167,7 +167,7 @@ addFilter(
 	'blocks.getSaveContent.extraProps',
 	'blockify/apply-animation-styles',
 	( props, block, attributes ) => {
-		const animation: style = attributes?.animation ?? {};
+		const animation: cssAnimation = attributes?.animation ?? {};
 
 		if ( ! animation || ! Object?.keys( animation )?.length ) {
 			return props;
@@ -210,7 +210,7 @@ const Animation = ( { attributes, setAttributes }: blockProps ): JSX.Element =>
 				<Flex justify={ 'flex-end' }>
 					<FlexItem>
 						<Button
-							isSecondary
+							variant={ 'secondary' }
 							isSmall
 							icon={
 								animation?.playState === 'running' ? (
@@ -231,9 +231,7 @@ const Animation = ( { attributes, setAttributes }: blockProps ): JSX.Element =>
 									animation: {
 										...animation,
 										playState:
-											animation?.playState === 'running'
-												? 'paused'
-												: 'running',
+                                            animation?.playState === 'running' ? 'paused' : 'running',
 									},
 								} );
 							} }

diff --git a/src/utility/types.tsx b/src/utility/types.tsx
@@ -40,6 +40,7 @@ declare global {
 		controls?: BlockAlignmentToolbar.Control[] | AlignmentToolbar.Props['alignmentControls'] | BlockControls.Props['controls'];
 		onChange?: ( newValue: string | number | boolean | object | null | undefined ) => void;
 		subfields?: CustomField[];
+		allowReset?: boolean;
 	}
 
 	interface CustomBlock {