Merge branch 'master' into improved-error-meta-handler

nk-crew · Nov 4, 2024 · afdd8db · afdd8db
2 parents 1beecac + d4bfafa
commit afdd8db
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 7 deletions.
diff --git a/assets/editor/index.scss b/assets/editor/index.scss
@@ -208,7 +208,8 @@
 }
 
 .lzb-date-time-picker-toggle.components-button {
-	padding: 7px 0;
+	padding: 7px;
+	margin-left: -7px;
 	text-decoration: none;
 
 	svg {
@@ -217,6 +218,12 @@
 	}
 }
 
+.lzb-date-time-picker-reset {
+	display: flex;
+	justify-content: flex-end;
+	margin-top: 0.5rem;
+}
+
 // Color Picker control
 .lazyblocks-control-color {
 	// Combine multiple color pickers without label.

diff --git a/build/control-date-time.asset.php b/build/control-date-time.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-components', 'wp-date', 'wp-hooks', 'wp-i18n'), 'version' => 'be897623eeab248f5aa8');
+<?php return array('dependencies' => array('wp-components', 'wp-date', 'wp-hooks', 'wp-i18n'), 'version' => '62ebcfeb40e7ed03c801');
diff --git a/build/control-date-time.js b/build/control-date-time.js
diff --git a/build/editor-rtl.css b/build/editor-rtl.css
diff --git a/build/editor.asset.php b/build/editor.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => 'c748fc0fe9b6034cc671');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-hooks', 'wp-i18n'), 'version' => 'c748fc0fe9b6034cc671');
diff --git a/build/editor.css b/build/editor.css
diff --git a/controls/date_time/script.js b/controls/date_time/script.js
@@ -90,7 +90,7 @@ function DateTimePicker(props) {
 					}}
 					renderToggle={({ isOpen, onToggle }) => (
 						<Button
-							isLink
+							variant="tertiary"
 							aria-expanded={isOpen}
 							onClick={onToggle}
 							className="lzb-date-time-picker-toggle"
@@ -159,6 +159,20 @@ function DateTimePicker(props) {
 							) : (
 								''
 							)}
+							{value ? (
+								<div className="lzb-date-time-picker-reset">
+									<Button
+										variant="tertiary"
+										onClick={() => {
+											onChange(null);
+										}}
+									>
+										{__('Reset', 'lazy-blocks')}
+									</Button>
+								</div>
+							) : (
+								''
+							)}
 						</div>
 					)}
 				/>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<?php return array('dependencies' => array('wp-components', 'wp-date', 'wp-hooks', 'wp-i18n'), 'version' => 'be897623eeab248f5aa8');
		<?php return array('dependencies' => array('wp-components', 'wp-date', 'wp-hooks', 'wp-i18n'), 'version' => '62ebcfeb40e7ed03c801');