minor bug fix

Author: Arukuen

src/components/advanced-range-control/index.js

@@ -269,7 +269,11 @@ const AdvancedRangeControl = props => {
 		// Since the actual previous value is a preset, force the new custom value
 		// when changing unit
 		controlProps.onChangeUnit = ( unit, unitAttrName ) => {
+			dispatch( 'core/block-editor' ).__unstableMarkNextChangeAsNotPersistent()
 			setAttributes( { [ unitAttrName ]: unit } )
+			if ( props.onChangeUnit ) {
+				props.onChangeUnit( unit )
+			}
 			_onChange( _newValue )
 		}
 	}

src/components/font-size-control/index.js

@@ -39,7 +39,7 @@ const FontSizeControl = props => {
 			placeholder={ passedPlaceholder }
 			onChangeUnit={ value => {
 				// Change font-size so as not to surprise the user.
-				if ( props.value !== '' && ! isNaN( Number( value ) ) ) {
+				if ( props.value !== '' && ! isNaN( Number( props.value ) ) ) {
 					if ( value === 'em' || value === 'rem' ) {
 						props.onChange( String( pxToEm( props.value ) ) )
 					} else if ( value === 'px' ) {

src/components/four-range-control/index.js

@@ -439,8 +439,12 @@ const FourRangeControl = memo( props => {
 			// Since the actual previous value is a preset, force the new custom value
 			// when changing unit
 			controlProps.onChangeUnit = ( unit, unitAttrName ) => {
-				initialOnChange( _newValue )
+				dispatch( 'core/block-editor' ).__unstableMarkNextChangeAsNotPersistent()
 				setAttributes( { [ unitAttrName ]: unit } )
+				if ( props.onChangeUnit ) {
+					props.onChangeUnit( unit )
+				}
+				initialOnChange( _newValue )
 			}
 		}