orc-shared 5.8.0-dev.16 → 5.8.0-dev.18

package/dist/components/MaterialUI/DataDisplay/Badge.js

@@ -39,7 +39,7 @@ var Badge = function Badge(_ref) {
     badge = _ref.badge,
     props = _objectWithoutProperties(_ref, _excluded);
   var classes = useStyles();
-  var classProp = !!((_props$classProp = props.classProp) != null && _props$classProp.badge) ? props.classProp : classes;
+  var classProp = (_props$classProp = props.classProp) != null && _props$classProp.badge ? props.classProp : classes;
   return /*#__PURE__*/_react.default.createElement(_Badge.default, {
     overlap: "circular",
     color: "primary",

package/dist/components/MaterialUI/Inputs/Select.js

@@ -185,6 +185,7 @@ __signature__(SelectIconButton, "useStyles{classes}", function () {
 __signature__(SelectIconButton, "useStyles{classes}", function () {
   return [useStyles];
 });
+var selectEmptyValue = "~~#~~";
 var Select = function Select(_ref) {
   var _selectProps$get;
   var options = _ref.options,
@@ -222,6 +223,16 @@ var Select = function Select(_ref) {
     options.sort(function (a, b) {
       return a.sortOrder > b.sortOrder ? 1 : -1;
     });
+  } else if (sortType === _SelectProps.sortTypeEnum.alphabetical) {
+    options.sort(function (a, b) {
+      if (a.value === selectEmptyValue) {
+        return -1;
+      }
+      if (b.value === selectEmptyValue) {
+        return 1;
+      }
+      return a.label.localeCompare(b.label);
+    });
   }
   if (showAllValue && showAllLabel) {
     options.unshift({
@@ -245,7 +256,7 @@ var Select = function Select(_ref) {
   var items = options == null ? void 0 : options.map(function (option) {
     var clss = option != null && option.level ? classes["level" + option.level] : "";
     var appliedClasses = (0, _classnames.default)(classes.baseItem, clss);
-    var labelClss = (0, _classnames.default)(_defineProperty(_defineProperty({}, classes.label, true), classes.emptyLabel, option.value === "" || option.value === "~~#~~"));
+    var labelClss = (0, _classnames.default)(_defineProperty(_defineProperty({}, classes.label, true), classes.emptyLabel, option.value === "" || option.value === selectEmptyValue));
     var disabled = !!option.disabled;
     var groupHeader = !!option.isGroupHeader;
     if (groupHeader) {
@@ -332,6 +343,7 @@ var _default3 = exports.default = _default2;
   reactHotLoader.register(getIconButtonMenuProps, "getIconButtonMenuProps", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/Select.js");
   reactHotLoader.register(SelectIcon, "SelectIcon", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/Select.js");
   reactHotLoader.register(SelectIconButton, "SelectIconButton", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/Select.js");
+  reactHotLoader.register(selectEmptyValue, "selectEmptyValue", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/Select.js");
   reactHotLoader.register(Select, "Select", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/Select.js");
   reactHotLoader.register(_default, "default", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/Select.js");
 })();
@@ -351,6 +363,7 @@ var _default3 = exports.default = _default2;
   reactHotLoader.register(getIconButtonMenuProps, "getIconButtonMenuProps", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/Select.js");
   reactHotLoader.register(SelectIcon, "SelectIcon", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/Select.js");
   reactHotLoader.register(SelectIconButton, "SelectIconButton", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/Select.js");
+  reactHotLoader.register(selectEmptyValue, "selectEmptyValue", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/Select.js");
   reactHotLoader.register(Select, "Select", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/Select.js");
   reactHotLoader.register(_default2, "default", "/home/vsts/work/1/s/src/components/MaterialUI/Inputs/Select.js");
 })();

package/dist/components/MaterialUI/Inputs/SelectProps.js

@@ -26,7 +26,8 @@ var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoader
 var sortTypeEnum = exports.sortTypeEnum = {
   none: 0,
   default: 1,
-  numeric: 2
+  numeric: 2,
+  alphabetical: 3
 };
 var SelectProps = /*#__PURE__*/function (_ComponentProps) {
   function SelectProps() {

package/dist/components/Routing/SegmentPage.js

@@ -186,7 +186,7 @@ var SegmentPage = function SegmentPage(_ref4) {
     modulePrependPath = _ref4.modulePrependPath,
     entityIdResolver = _ref4.entityIdResolver;
   var classes = useStyles({
-    isComponentNull: !!!View
+    isComponentNull: !View
   });
   var pattern = new _urlPattern.default(path);
   var baseHref = pattern.stringify(match.params);

package/dist/utils/normalizeForSearch.js

@@ -22,7 +22,10 @@ if ("".normalize) {
   normalizeForSearch = function normalizeForSearch(str) {
     return str.toLowerCase()
     // Strip accents by normalizing to letters + combining chars, then strip all combining chars.
-    .normalize("NFKD").replace(/[\u0300-\u036f\u1ab0-\u1aff\u1dc0-\u1dff\u20d0-\u20ff\ufe20-\ufe2f]/g, "");
+    .normalize("NFKD")
+    // Note AD20240801: the new eslint config complains on the next line however I have no idea what it is supposed to do so to be safe I'll disable the warning
+    // eslint-disable-next-line no-misleading-character-class
+    .replace(/[\u0300-\u036f\u1ab0-\u1aff\u1dc0-\u1dff\u20d0-\u20ff\ufe20-\ufe2f]/g, "");
   };
 } else {
   // IE11 does not support string#normalize(). V. sad for IE users.

package/dist/utils/propertyBagHelper.js

@@ -127,7 +127,7 @@ var getPropertyBagFormattedPrimitiveValue = exports.getPropertyBagFormattedPrimi
     return null;
   }
   if (dataTypesChecker.isBoolean(propertyBagValue[_constants.serializationTypeKey])) {
-    return Boolean(propertyBagValue.value) ? formatMessage(_sharedMessages.default.valueTypeWrapperTrue) : formatMessage(_sharedMessages.default.valueTypeWrapperFalse);
+    return propertyBagValue.value ? formatMessage(_sharedMessages.default.valueTypeWrapperTrue) : formatMessage(_sharedMessages.default.valueTypeWrapperFalse);
   }
   if (dataTypesChecker.isInteger(propertyBagValue[_constants.serializationTypeKey])) {
     return formatNumber(propertyBagValue.value, 0);
@@ -153,7 +153,7 @@ var formatNumber = exports.formatNumber = function formatNumber(value, precision
 };
 var fixPropertyBagModifiedModel = exports.fixPropertyBagModifiedModel = function fixPropertyBagModifiedModel(model) {
   var fixProfileOperations = function fixProfileOperations(model) {
-    if (model.hasOwnProperty("profileOperations")) {
+    if (Object.prototype.hasOwnProperty.call(model, "profileOperations")) {
       var _model$profileOperati = model.profileOperations,
         profilesToAdd = _model$profileOperati.profilesToAdd,
         profilesToUpdate = _model$profileOperati.profilesToUpdate;
@@ -198,7 +198,7 @@ var fixPropertyBagEmptyValues = exports.fixPropertyBagEmptyValues = function fix
   var modifiedFields = Object.keys(propertyBag);
   modifiedFields.forEach(function (propertyName) {
     var property = propertyBag[propertyName];
-    var propertyValue = property && (0, _propertyValidator.isObject)(property) && property.hasOwnProperty("value") ? property.value : property;
+    var propertyValue = property && (0, _propertyValidator.isObject)(property) && Object.prototype.hasOwnProperty.call(property, "value") ? property.value : property;
     if (propertyValue === "") {
       propertyBag[propertyName] = null;
     }

package/dist/utils/propertyHelper.js

@@ -48,11 +48,11 @@ function getPropertyOrDefault(obj, property, defaultValue, ignoreCase, startWith
     return getPropertyOrDefaultFromMap(obj, property, defaultValue, ignoreCase, startWith);
   }
   if (ignoreCase === false && startWith === false) {
-    return obj.hasOwnProperty(property) ? obj[property] : defaultValue;
+    return Object.prototype.hasOwnProperty.call(obj, property) ? obj[property] : defaultValue;
   }
   var compareFunction = startWith ? caseInsensitiveStartWithCompare : caseInsensitiveCompare;
   for (var prop in obj) {
-    if (obj.hasOwnProperty(prop) && compareFunction(prop, property)) {
+    if (Object.prototype.hasOwnProperty.call(obj, prop) && compareFunction(prop, property)) {
       return obj[prop];
     }
   }
@@ -60,11 +60,11 @@ function getPropertyOrDefault(obj, property, defaultValue, ignoreCase, startWith
 }
 var isObjectContainsPropertyWithValue = exports.isObjectContainsPropertyWithValue = function isObjectContainsPropertyWithValue(obj, propertyName, value) {
   if (obj === null || obj === undefined) return false;
-  if (obj.hasOwnProperty(propertyName) && obj[propertyName] === value) {
+  if (Object.prototype.hasOwnProperty.call(obj, propertyName) && obj[propertyName] === value) {
     return true;
   }
   for (var prop in obj) {
-    if (obj.hasOwnProperty(prop) && typeof obj[prop] === "object") {
+    if (Object.prototype.hasOwnProperty.call(obj, prop) && typeof obj[prop] === "object") {
       if (isObjectContainsPropertyWithValue(obj[prop], propertyName, value)) return true;
     }
   }
@@ -72,11 +72,11 @@ var isObjectContainsPropertyWithValue = exports.isObjectContainsPropertyWithValu
 };
 var isObjectContainsPropertyWithAnyValue = exports.isObjectContainsPropertyWithAnyValue = function isObjectContainsPropertyWithAnyValue(obj, propertyName) {
   if (!obj) return false;
-  if (obj.hasOwnProperty(propertyName) && obj[propertyName]) {
+  if (Object.prototype.hasOwnProperty.call(obj, propertyName) && obj[propertyName]) {
     return true;
   }
   for (var prop in obj) {
-    if (obj.hasOwnProperty(prop) && typeof obj[prop] === "object") {
+    if (Object.prototype.hasOwnProperty.call(obj, prop) && typeof obj[prop] === "object") {
       if (isObjectContainsPropertyWithAnyValue(obj[prop], propertyName)) return true;
     }
   }

package/dist/utils/testUtils.js

@@ -43,6 +43,7 @@ var spyOnConsole = exports.spyOnConsole = function spyOnConsole(spyNames) {
     spyNames = ["log", "warn", "error"];
   }
   var spiedFuncs;
+  // eslint-disable-next-line no-undef
   beforeEach(function () {
     spiedFuncs = spyNames.map(function (funcName) {
       var func = sinon.spy().named("console." + funcName);
@@ -51,6 +52,7 @@ var spyOnConsole = exports.spyOnConsole = function spyOnConsole(spyNames) {
       return oldFunc;
     });
   });
+  // eslint-disable-next-line no-undef
   afterEach(function () {
     spiedFuncs.forEach(function (func, index) {
       var name = spyNames[index];
@@ -117,6 +119,7 @@ var PropStruct = exports.PropStruct = _react.default.forwardRef(function (props,
   );
 });
 var ignoreConsoleError = exports.ignoreConsoleError = function ignoreConsoleError(func) {
+  // eslint-disable-next-line no-undef
   jest.spyOn(console, "error");
   console.error.mockImplementation(function () {});
   func();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "5.8.0-dev.16",
+	"version": "5.8.0-dev.18",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {
@@ -55,7 +55,7 @@
 		"@testing-library/react": "^10.4.9"
 	},
 	"dependencies": {
-		"orc-scripts": "^4.0.0-dev.9",
+		"orc-scripts": "^4.0.0-dev.10",
 		"react-number-format": "^5.3.0"
 	},
 	"sideEffects": false,

package/src/components/AppFrame/ConnectedToastList.test.js

@@ -169,7 +169,9 @@ describe("ConnectedToastList", () => {
 		try {
 			ReactDOM.unmountComponentAtNode(appRoot);
 			ReactDOM.unmountComponentAtNode(document.getElementById("toast"));
-		} catch (_) {}
+		} catch {
+			// don't do anything
+		}
 		document.body.removeChild(appRoot);
 	});
 });

package/src/components/MaterialUI/DataDisplay/Badge.js

@@ -13,7 +13,7 @@ const useStyles = makeStyles(theme => ({
 
 const Badge = ({ children, badge, ...props }) => {
 	const classes = useStyles();
-	const classProp = !!props.classProp?.badge ? props.classProp : classes;
+	const classProp = props.classProp?.badge ? props.classProp : classes;
 
 	return (
 		<BadgeMui overlap="circular" color="primary" max={999} badgeContent={badge} classes={classProp}>

package/src/components/MaterialUI/Inputs/Select.js

@@ -145,6 +145,8 @@ export const SelectIconButton = props => {
 	);
 };
 
+const selectEmptyValue = "~~#~~";
+
 const Select = ({ options, selectProps, children }) => {
 	if (isSelectProps(selectProps) === false) {
 		throw new TypeError("selectProps property is not of type SelectProps");
@@ -177,6 +179,16 @@ const Select = ({ options, selectProps, children }) => {
 		);
 	} else if (sortType === sortTypeEnum.default) {
 		options.sort((a, b) => (a.sortOrder > b.sortOrder ? 1 : -1));
+	} else if (sortType === sortTypeEnum.alphabetical) {
+		options.sort((a, b) => {
+			if (a.value === selectEmptyValue) {
+				return -1;
+			}
+			if (b.value === selectEmptyValue) {
+				return 1;
+			}
+			return a.label.localeCompare(b.label);
+		});
 	}
 
 	if (showAllValue && showAllLabel) {
@@ -207,7 +219,7 @@ const Select = ({ options, selectProps, children }) => {
 		const appliedClasses = classNames(classes.baseItem, clss);
 		const labelClss = classNames({
 			[classes.label]: true,
-			[classes.emptyLabel]: option.value === "" || option.value === "~~#~~",
+			[classes.emptyLabel]: option.value === "" || option.value === selectEmptyValue,
 		});
 
 		const disabled = !!option.disabled;

package/src/components/MaterialUI/Inputs/Select.test.js

@@ -496,6 +496,43 @@ describe("Select Component", () => {
 		expect(optionsKeys, "to equal", ["#All#", "a", "b", "c"]);
 	});
 
+	it("Sorts select options correctly with alphabetical sorting", () => {
+		const emptyValue = "~~#~~";
+
+		const options = [
+			{ value: "c", label: "c" },
+			{ value: "a", label: "a" },
+			{ value: "b", label: "b" },
+			{ value: "f", label: "f" },
+			{ value: emptyValue, label: "empty" },
+			{ value: "h", label: "h" },
+			{ value: "g", label: "g" },
+			{ value: "e", label: "e" },
+			{ value: "d", label: "[d]" },
+		];
+
+		const selectProps = new SelectProps();
+
+		selectProps.set(SelectProps.propNames.sortType, sortTypeEnum.alphabetical);
+		selectProps.set(SelectProps.propNames.value, "b");
+
+		const component = (
+			<TestWrapper stylesProvider muiThemeProvider={{ theme }}>
+				<Select options={options} selectProps={selectProps} />
+			</TestWrapper>
+		);
+
+		const mountedComponent = mount(component);
+
+		const test = mountedComponent.find(SelectMUI);
+
+		const mountedOptions = test.props().children;
+
+		const optionsKeys = mountedOptions.map(option => option.key);
+
+		expect(optionsKeys, "to equal", [emptyValue, "d", "a", "b", "c", "e", "f", "g", "h"]);
+	});
+
 	it("Sorts select options correctly with numeric sorting", () => {
 		const options = [
 			{ value: "BRC-409 - BRC-PROMENADES", label: "BRC-409 - BRC-PROMENADES", sortOrder: "BRC-409 - BRC-PROMENADES" },

package/src/components/MaterialUI/Inputs/SelectProps.js

@@ -4,6 +4,7 @@ export const sortTypeEnum = {
 	none: 0,
 	default: 1,
 	numeric: 2,
+	alphabetical: 3,
 };
 
 class SelectProps extends ComponentProps {

package/src/components/Modal/Modal.test.js

@@ -22,7 +22,9 @@ describe("Modal", () => {
 	afterEach(() => {
 		try {
 			ReactDOM.unmountComponentAtNode(appRoot);
-		} catch (_) {}
+		} catch {
+			// don't do anything
+		}
 		document.body.removeChild(appRoot);
 		document.body.removeChild(modalRoot);
 	});

package/src/components/Modal/Wrapper.test.js

@@ -35,7 +35,9 @@ describe("Wrapper", () => {
 		afterEach(() => {
 			try {
 				ReactDOM.unmountComponentAtNode(appRoot);
-			} catch (_) {}
+			} catch {
+				// don't do anything
+			}
 			document.body.removeChild(appRoot);
 			document.body.removeChild(modalRoot);
 		});

package/src/components/Routing/SegmentPage.js

@@ -168,7 +168,7 @@ const SegmentPage = ({
 	modulePrependPath,
 	entityIdResolver,
 }) => {
-	const classes = useStyles({ isComponentNull: !!!View });
+	const classes = useStyles({ isComponentNull: !View });
 	const pattern = new UrlPattern(path);
 	const baseHref = pattern.stringify(match.params);
 	const pages = [],

package/src/components/Scope/Scope.test.js

@@ -121,7 +121,9 @@ beforeEach(() => {
 afterEach(() => {
 	try {
 		ReactDOM.unmountComponentAtNode(appRoot);
-	} catch (_) {}
+	} catch {
+		// don't do anything
+	}
 	document.body.removeChild(appRoot);
 	document.body.removeChild(modalRoot);
 });

package/src/components/Sidepanel.test.js

@@ -25,7 +25,9 @@ describe("Sidepanel", () => {
 	afterEach(() => {
 		try {
 			ReactDOM.unmountComponentAtNode(appRoot);
-		} catch (_) {}
+		} catch {
+			// don't do anything
+		}
 		document.body.removeChild(appRoot);
 		document.body.removeChild(modalRoot);
 	});

package/src/utils/normalizeForSearch.js

@@ -6,6 +6,8 @@ if ("".normalize) {
 			.toLowerCase()
 			// Strip accents by normalizing to letters + combining chars, then strip all combining chars.
 			.normalize("NFKD")
+			// Note AD20240801: the new eslint config complains on the next line however I have no idea what it is supposed to do so to be safe I'll disable the warning
+			// eslint-disable-next-line no-misleading-character-class
 			.replace(/[\u0300-\u036f\u1ab0-\u1aff\u1dc0-\u1dff\u20d0-\u20ff\ufe20-\ufe2f]/g, "");
 } else {
 	// IE11 does not support string#normalize(). V. sad for IE users.

package/src/utils/propertyBagHelper.js

@@ -149,7 +149,7 @@ export const getPropertyBagFormattedPrimitiveValue = (propertyBagValue, formatMe
 	}
 
 	if (dataTypesChecker.isBoolean(propertyBagValue[serializationTypeKey])) {
-		return Boolean(propertyBagValue.value)
+		return propertyBagValue.value
 			? formatMessage(sharedMessages.valueTypeWrapperTrue)
 			: formatMessage(sharedMessages.valueTypeWrapperFalse);
 	}
@@ -182,7 +182,7 @@ export const formatNumber = (value, precision) => Number(value).toFixed(precisio
 
 export const fixPropertyBagModifiedModel = (model, ...fields) => {
 	const fixProfileOperations = model => {
-		if (model.hasOwnProperty("profileOperations")) {
+		if (Object.prototype.hasOwnProperty.call(model, "profileOperations")) {
 			let { profilesToAdd, profilesToUpdate } = model.profileOperations;
 			if (profilesToAdd) {
 				const items = Array.isArray(profilesToAdd) ? profilesToAdd : Object.values(profilesToAdd);
@@ -224,7 +224,10 @@ export const fixPropertyBagEmptyValues = propertyBag => {
 	const modifiedFields = Object.keys(propertyBag);
 	modifiedFields.forEach(propertyName => {
 		let property = propertyBag[propertyName];
-		let propertyValue = property && isObject(property) && property.hasOwnProperty("value") ? property.value : property;
+		let propertyValue =
+			property && isObject(property) && Object.prototype.hasOwnProperty.call(property, "value")
+				? property.value
+				: property;
 		if (propertyValue === "") {
 			propertyBag[propertyName] = null;
 		}

package/src/utils/propertyHelper.js

@@ -22,13 +22,13 @@ export function getPropertyOrDefault(obj, property, defaultValue, ignoreCase = f
 	}
 
 	if (ignoreCase === false && startWith === false) {
-		return obj.hasOwnProperty(property) ? obj[property] : defaultValue;
+		return Object.prototype.hasOwnProperty.call(obj, property) ? obj[property] : defaultValue;
 	}
 
 	const compareFunction = startWith ? caseInsensitiveStartWithCompare : caseInsensitiveCompare;
 
 	for (let prop in obj) {
-		if (obj.hasOwnProperty(prop) && compareFunction(prop, property)) {
+		if (Object.prototype.hasOwnProperty.call(obj, prop) && compareFunction(prop, property)) {
 			return obj[prop];
 		}
 	}
@@ -39,12 +39,12 @@ export function getPropertyOrDefault(obj, property, defaultValue, ignoreCase = f
 export const isObjectContainsPropertyWithValue = (obj, propertyName, value) => {
 	if (obj === null || obj === undefined) return false;
 
-	if (obj.hasOwnProperty(propertyName) && obj[propertyName] === value) {
+	if (Object.prototype.hasOwnProperty.call(obj, propertyName) && obj[propertyName] === value) {
 		return true;
 	}
 
 	for (let prop in obj) {
-		if (obj.hasOwnProperty(prop) && typeof obj[prop] === "object") {
+		if (Object.prototype.hasOwnProperty.call(obj, prop) && typeof obj[prop] === "object") {
 			if (isObjectContainsPropertyWithValue(obj[prop], propertyName, value)) return true;
 		}
 	}
@@ -55,12 +55,12 @@ export const isObjectContainsPropertyWithValue = (obj, propertyName, value) => {
 export const isObjectContainsPropertyWithAnyValue = (obj, propertyName) => {
 	if (!obj) return false;
 
-	if (obj.hasOwnProperty(propertyName) && obj[propertyName]) {
+	if (Object.prototype.hasOwnProperty.call(obj, propertyName) && obj[propertyName]) {
 		return true;
 	}
 
 	for (let prop in obj) {
-		if (obj.hasOwnProperty(prop) && typeof obj[prop] === "object") {
+		if (Object.prototype.hasOwnProperty.call(obj, prop) && typeof obj[prop] === "object") {
 			if (isObjectContainsPropertyWithAnyValue(obj[prop], propertyName)) return true;
 		}
 	}

package/src/utils/testUtils.js

@@ -15,6 +15,7 @@ const sinon = require("sinon");
 /* istanbul ignore next */
 export const spyOnConsole = (spyNames = ["log", "warn", "error"]) => {
 	let spiedFuncs;
+	// eslint-disable-next-line no-undef
 	beforeEach(() => {
 		spiedFuncs = spyNames.map(funcName => {
 			const func = sinon.spy().named("console." + funcName);
@@ -23,6 +24,7 @@ export const spyOnConsole = (spyNames = ["log", "warn", "error"]) => {
 			return oldFunc;
 		});
 	});
+	// eslint-disable-next-line no-undef
 	afterEach(() => {
 		spiedFuncs.forEach((func, index) => {
 			const name = spyNames[index];
@@ -74,34 +76,35 @@ export const PropStruct = React.forwardRef((props, ref) => (
 				value === undefined || value === null
 					? null
 					: value === "__ignore"
-					? [<Ignore key={"dt-" + key} />, <Ignore key={"dd-" + key} />]
-					: [
-							<dt key={"dt-" + key}>{`${key}:`}</dt>,
-							<dd key={"dd-" + key}>
-								{key === "children" ? (
-									value
-								) : typeof value === "object" ? (
-									value["$$typeof"] && value["$$typeof"] === Symbol.for("react.element") ? (
-										"React <" + (value.type.name || value.type) + ">"
+						? [<Ignore key={"dt-" + key} />, <Ignore key={"dd-" + key} />]
+						: [
+								<dt key={"dt-" + key}>{`${key}:`}</dt>,
+								<dd key={"dd-" + key}>
+									{key === "children" ? (
+										value
+									) : typeof value === "object" ? (
+										value["$$typeof"] && value["$$typeof"] === Symbol.for("react.element") ? (
+											"React <" + (value.type.name || value.type) + ">"
+										) : (
+											<PropStruct {...value} />
+										)
+									) : typeof value === "function" ? (
+										"Function"
+									) : typeof value === "string" ? (
+										`string "${value}"`
+									) : typeof value === "symbol" ? (
+										`symbol ${value.toString()}`
 									) : (
-										<PropStruct {...value} />
-									)
-								) : typeof value === "function" ? (
-									"Function"
-								) : typeof value === "string" ? (
-									`string "${value}"`
-								) : typeof value === "symbol" ? (
-									`symbol ${value.toString()}`
-								) : (
-									typeof value + " " + value
-								)}
-							</dd>,
-					  ],
+										typeof value + " " + value
+									)}
+								</dd>,
+							],
 			)}
 	</dl>
 ));
 
 export const ignoreConsoleError = func => {
+	// eslint-disable-next-line no-undef
 	jest.spyOn(console, "error");
 	console.error.mockImplementation(() => {});