* Revert #46262

* Remove pnpm-lock.yaml

* Revert "Remove pnpm-lock.yaml"

This reverts commit df4b87940d.

* Add changefile(s) from automation for the following project(s): woocommerce-blocks

* Revert pnpm-lock.yaml

---------

Co-authored-by: github-actions <github-actions@github.com>
This commit is contained in:
Niels Lange 2024-07-11 19:00:49 +02:00 committed by GitHub
parent aeab61838c
commit 79786c5443
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 45 additions and 59 deletions

View File

@ -1,6 +1,6 @@
.wc-block-components-totals-discount__coupon-list {
list-style: none;
margin: $gap-smallest 0 0;
margin: 0;
padding: 0;
}

View File

@ -3,13 +3,12 @@
*/
import clsx from 'clsx';
import { __ } from '@wordpress/i18n';
import { useEffect, useId, useRef, useState } from '@wordpress/element';
import { useEffect, useId, useRef } from '@wordpress/element';
import { ComboboxControl } from 'wordpress-components';
import { ValidationInputError } from '@woocommerce/blocks-components';
import { isObject } from '@woocommerce/types';
import { useDispatch, useSelect } from '@wordpress/data';
import { VALIDATION_STORE_KEY } from '@woocommerce/block-data';
import { Icon, chevronUp, chevronDown } from '@wordpress/icons';
/**
* Internal dependencies
@ -66,8 +65,6 @@ const Combobox = ( {
};
} );
const [ isFocused, setIsFocused ] = useState( false );
useEffect( () => {
if ( ! required || value ) {
clearValidationError( errorId );
@ -101,17 +98,11 @@ const Combobox = ( {
'has-error': error?.message && ! error?.hidden,
} ) }
ref={ controlRef }
onFocus={ () => setIsFocused( true ) }
onBlur={ () => setIsFocused( false ) }
>
<ComboboxControl
className={ 'wc-block-components-combobox-control' }
label={ label }
onChange={ ( selectedValue: string ) => {
onChange( selectedValue );
setIsFocused( false );
} }
onSelect={ () => setIsFocused( false ) }
onChange={ onChange }
onFilterValueChange={ ( filterValue: string ) => {
if ( filterValue.length ) {
// If we have a value and the combobox is not focussed, this could be from browser autofill.
@ -163,7 +154,6 @@ const Combobox = ( {
aria-invalid={ error?.message && ! error?.hidden }
aria-errormessage={ validationErrorId }
/>
<Icon icon={ isFocused ? chevronUp : chevronDown } />
<ValidationInputError propertyName={ errorId } />
</div>
);

View File

@ -6,16 +6,6 @@
.wc-block-components-form .wc-block-components-combobox,
.wc-block-components-combobox {
position: relative;
svg {
fill: currentColor;
position: absolute;
right: 15px;
top: 15px;
pointer-events: none;
}
.wc-block-components-combobox-control {
@include reset-typography();
@include reset-box();
@ -41,10 +31,10 @@
line-height: em($gap);
box-sizing: border-box;
outline: inherit;
border: 1px solid $universal-border-light;
border: 1px solid $input-border-gray;
background: #fff;
box-shadow: none;
color: currentColor;
color: $input-text-active;
font-family: inherit;
font-weight: normal;
letter-spacing: inherit;
@ -55,14 +45,14 @@
width: 100%;
opacity: initial;
border-radius: $universal-border-radius;
max-height: 50px;
max-height: 52px;
&[aria-expanded="true"],
&:focus {
background-color: #fff;
color: $input-text-active;
outline: 0;
box-shadow: 0 0 0 2px currentColor;
border-bottom: 0;
box-shadow: 0 0 0 1px $input-border-gray;
}
&[aria-expanded="true"] {
@ -78,7 +68,7 @@
&:focus {
background-color: $input-background-dark;
color: $input-text-dark;
box-shadow: 0 0 0 2px $input-border-gray;
box-shadow: 0 0 0 1px $input-border-dark;
}
}
}
@ -86,19 +76,18 @@
position: absolute;
z-index: 10;
background-color: $select-dropdown-light;
border: 2px solid currentColor;
border: 1px solid $input-border-gray;
border-top: 0;
border-bottom-width: 2px;
border-bottom: 0;
margin: 3em 0 0 0;
padding: 0;
max-height: 300px;
min-width: calc(100% + 4px);
left: -2px;
top: -1px;
min-width: 100%;
overflow: auto;
color: currentColor;
border-bottom-left-radius: $universal-border-radius;
border-bottom-right-radius: $universal-border-radius;
box-shadow: 0 1px 0 1px $input-border-gray;
box-sizing: border-box;
.has-dark-controls & {
@ -108,7 +97,7 @@
.components-form-token-field__suggestion {
@include font-size(regular);
color: currentColor;
color: $gray-700;
cursor: default;
list-style: none;
margin: 0;
@ -144,10 +133,10 @@
transform: translateY(em($gap));
line-height: 1.25; // =20px when font-size is 16px.
left: em($gap-smaller);
top: 0;
top: -2px;
transform-origin: top left;
transition: all 200ms ease;
color: currentColor;
color: $universal-body-low-emphasis;
z-index: 1;
margin: 0;
overflow: hidden;
@ -166,7 +155,7 @@
.wc-block-components-combobox-control:has(input:-webkit-autofill) {
label {
transform: translateY(25%) scale(0.75);
transform: translateY(em($gap-smaller)) scale(0.875);
}
}
@ -174,7 +163,7 @@
&:focus-within {
.wc-block-components-combobox-control
label.components-base-control__label {
transform: translateY(25%) scale(0.75);
transform: translateY(em($gap-smaller)) scale(0.875);
}
}

View File

@ -65,7 +65,6 @@
background: none;
border: none;
cursor: pointer;
color: currentColor;
font-size: inherit;
margin-top: $gap;
text-align: left;

View File

@ -12,14 +12,13 @@
.wc-block-checkout__add-note .wc-block-components-textarea {
border: 1px solid $universal-border-light;
margin-top: $gap;
&:focus {
background-color: #fff;
color: currentColor;
color: $input-text-active;
outline: 0;
box-shadow: 0 0 0 2px currentColor;
box-shadow: 0 0 0 1px $input-border-gray;
}
}

View File

@ -44,8 +44,13 @@
color: #333;
}
&.wc-block-checkout__shipping-method-option--selected {
outline: 2px solid currentColor !important; // Overwriting previous !important statement
outline: 1px solid $universal-border-strong;
background-color: $universal-background;
&:focus {
outline: 1px solid $universal-border-strong;
background-color: $universal-background;
}
}
}

View File

@ -22,7 +22,6 @@
border: 1px solid $universal-border-medium;
border-radius: $universal-border-radius;
box-sizing: border-box;
color: currentColor;
height: em(24px);
width: em(24px);
margin: 0;
@ -35,11 +34,11 @@
background-color: #fff;
&:checked {
border: 1px solid currentColor;
background: #fff;
}
&:focus {
outline: 2px solid currentColor;
outline: 1px solid $universal-border-strong;
outline-offset: 2px;
}
@ -89,7 +88,7 @@
}
.wc-block-components-checkbox__mark {
fill: currentColor;
fill: #000;
position: absolute;
margin-left: em(3px);
margin-top: em(1px);

View File

@ -161,7 +161,6 @@
background: #fff;
border: 1px solid $universal-border-medium;
border-radius: 50%;
color: currentColor;
display: inline-block;
height: em(24px); // =1.5rem
min-height: 24px;
@ -175,16 +174,16 @@
margin: inherit;
cursor: pointer;
&:checked {
border: 1px solid currentColor;
border: 1px solid $universal-border-strong;
}
&:focus {
outline: 2px solid currentColor;
outline: 1px solid $universal-border-strong;
outline-offset: 2px;
}
&:checked::before {
background: currentColor;
background: #000;
border-radius: 50%;
content: "";
display: block;

View File

@ -5,6 +5,7 @@
white-space: nowrap;
label {
@include reset-color();
@include reset-typography();
@include font-size(regular);
position: absolute;
@ -13,7 +14,7 @@
left: em($gap-smaller + 1px);
top: 0;
transform-origin: top left;
color: currentColor;
color: $universal-body-low-emphasis;
transition: all 200ms ease;
margin: 0;
overflow: hidden;
@ -48,7 +49,7 @@
line-height: em($gap);
width: 100%;
border-radius: $universal-border-radius;
border: 1px solid $universal-border-light;
border: 1px solid $universal-border-strong;
font-family: inherit;
margin: 0;
@ -56,12 +57,13 @@
min-height: 0;
max-height: 52px;
background-color: #fff;
color: currentColor;
color: $input-text-active;
&:focus {
background-color: #fff;
color: $input-text-active;
outline: 0;
box-shadow: 0 0 0 2px currentColor;
box-shadow: 0 0 0 1px $input-border-gray;
}
.has-dark-controls & {
@ -72,7 +74,7 @@
&:focus {
background-color: $input-background-dark;
color: $input-text-dark;
box-shadow: 0 0 0 2px $input-border-dark;
box-shadow: 0 0 0 1px $input-border-dark;
}
}
}
@ -88,7 +90,7 @@
&.is-active label,
input:-webkit-autofill + label {
transform: translateY(25%) scale(0.75);
transform: translateY(em($gap-smaller)) scale(0.875);
}
&.has-error input {

View File

@ -3,7 +3,7 @@
background-color: #fff;
border: 1px solid $universal-border-strong;
border-radius: $universal-border-radius;
color: currentColor;
color: $input-text-active;
font-family: inherit;
line-height: 1.375; // =22px when font-size is 16px.
margin: 0;

View File

@ -0,0 +1,4 @@
Significance: patch
Type: tweak
Comment: This PR reverts #46262, as that PR would render input values invisible under certain conditions.