From 31e7ca2ae48c20941ab1c10e23d99122e9008e6b Mon Sep 17 00:00:00 2001
From: Herb Miller <herb@bobbingwide.com>
Date: Thu, 17 Oct 2024 09:41:08 +0100
Subject: [PATCH] Correct renderCustom. Adjust labels #69
---
src/oik-dashicon/SVGSelect.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/oik-dashicon/SVGSelect.js b/src/oik-dashicon/SVGSelect.js
index 59bfe6d..f55cb67 100644
--- 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 } ) }/>;
}