fix: unit attributes gets added on reload

Author: kaeizen

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

@@ -113,10 +113,6 @@ const AdvancedRangeControl = props => {
 	let derivedValue = typeof props.value === 'undefined'
 		? value : props.value
 
-	// Is value at first render the same as a step value? If so, do mark mode
-	// at the start, or show custom
-	// If no initial value, use the given default from the settings
-	const [ isMarkMode, setIsMarkMode ] = useState( false )
 	// Ensure the convesion of value from preset to custom with regards to the unit is donce once.
 	const isConversionDone = useRef( false )
 
@@ -132,6 +128,11 @@ const AdvancedRangeControl = props => {
 		}
 	}
 
+	// Is value at first render the same as a step value? If so, do mark mode
+	// at the start, or show custom
+	// If no initial value, use the given default from the settings
+	const [ isMarkMode, setIsMarkMode ] = useState( isMarkValue )
+
 	// Set the markMode when device type changes
 	useEffect( () => {
 		setIsMarkMode( isMarkValue )

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

@@ -189,7 +189,6 @@ const FourRangeControl = memo( props => {
 				: props.enableBottom ? { desktop: _valueDesktop?.bottom, tablet: _valueTablet?.bottom }
 					: { desktop: _valueDesktop?.left, tablet: _valueTablet?.left }
 
-	const [ isFourMarkMode, setIsFourMarkMode ] = useState( false )
 	// Ensure the convesion of value from preset to custom with regards to the unit is donce once.
 	const isConversionDone = useRef( {
 		first: false,
@@ -232,6 +231,8 @@ const FourRangeControl = memo( props => {
 		} )
 	}
 
+	const [ isFourMarkMode, setIsFourMarkMode ] = useState( isMarkValue )
+
 	// Set the markMode when device type changes
 	useEffect( () => {
 		setIsFourMarkMode( isMarkValue )