Correct renderCustom. Adjust labels #69

bobbingwide · Oct 17, 2024 · 31e7ca2 · 31e7ca2
1 parent aac18f9
commit 31e7ca2
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/oik-dashicon/SVGSelect.js b/src/oik-dashicon/SVGSelect.js
@@ -14,19 +14,19 @@ function renderOption( icon ) {
 function renderCustom( icon ) {
 	var label = icon && icon.name ? icon.name : icon;
 	//var iconValue = icon && icon.icon ? <Icon icon={icon.icon} /> : <Icon icon={icon} />
-	var iconValue = icon && icon.icon ? icon.icon : <Icon icon={icon} />;
+	var iconValue = ( icon && icon.icon ) ? <Icon icon={icon.icon } /> : <Icon icon={icon} />;
 	var option = { 'key': label, 'name': iconValue };
 	return option;
 }
 
 function SVGSelectControl( { value, onChange, ...props }) {
 	var SVGoptions = dashiconslist.map( ( icon ) => renderOption( icon ) );
-	return <SelectControl label={__("Icon", 'oik-bob-bing-wide')} value={value} options={ SVGoptions } onChange={onChange }/>;
+	return <SelectControl label={__("Icon select", 'oik-bob-bing-wide')} value={value} options={ SVGoptions } onChange={onChange }/>;
 }
 
 function SVGComboboxControl( { value, onChange, ...props } ) {
 	var SVGoptions = dashiconslist.map( ( icon ) => renderOption( icon ) );
-	return <ComboboxControl label={__("Icon", 'oik-bob-bing-wide')}value={value} options={ SVGoptions } onChange={onChange }/>;
+	return <ComboboxControl label={__("Icon combo", 'oik-bob-bing-wide')}value={value} options={ SVGoptions } onChange={onChange }/>;
 }
 
 /**
@@ -51,7 +51,7 @@ function SVGCustomSelectControl( { value, setAttributes, ...props } ) {
 	//console.log( SVGoptions );
 	var selectedValue= SVGoptions.find(  (option ) => option.key === value ) ;
 
-	return <CustomSelectControl label={__("Icon", 'oik-bob-bing-wide')} value={ selectedValue  } options={ SVGoptions }
+	return <CustomSelectControl label={__("Icon custom select", 'oik-bob-bing-wide')} value={ selectedValue  } options={ SVGoptions }
 	onChange={ ( { selectedItem } ) => setAttributes( { dashicon: selectedItem.key } ) }/>;
 }