4.7.2 release

CHANGELOG.md

@@ -7,6 +7,12 @@ The following is a curated list of changes in the Enact project, newest changes
 ### Fixed
 
 - `ui/Scroller` and `ui/VirtualList` to pass scrolling state properly to UI libraries
+## [4.7.2] - 2023-07-14
+
+### Fixed
+
+- `core/handle.forwardCustom` and `core/handle.forwardCustomWithPrevent` to bind an adapter function properly
+- `spotlight` to not show the focus effect when pointer mode is changed to `false` by touch while an app is loading
 
 ## [4.7.1] - 2023-06-02
 

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "4.0.0",
-  "version": "4.7.1",
+  "version": "4.7.2",
   "command": {
     "bootstrap": {
       "ci": false,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "enact",
-  "version": "4.7.1",
+  "version": "4.7.2",
   "description": "Monorepo for all Enact front end libraries.",
   "private": true,
   "scripts": {

packages/core/CHANGELOG.md

@@ -5,6 +5,11 @@ The following is a curated list of changes in the Enact core module, newest chan
 ## [4.5.4] - 2023-06-07
 
 No significant changes.
+## [4.7.2] - 2023-07-14
+
+### Fixed
+
+- `core/handle.forwardCustom` and `core/handle.forwardCustomWithPrevent` to bind an adapter function properly
 
 ## [4.7.1] - 2023-06-02
 

packages/core/handle/handle.js

@@ -730,10 +730,10 @@ const adaptEvent = handle.adaptEvent = curry(function (adapter, handler) {
  * @memberof core/handle
  * @public
  */
-const forwardCustom = handle.forwardCustom = (name, adapter) => handle(
-	adaptEvent(
-		(ev, ...args) => {
-			let customEventPayload = adapter ? adapter(ev, ...args) : null;
+const forwardCustom = handle.forwardCustom = function (name, adapter) {
+	return named(adaptEvent(
+		function (ev, ...args) {
+			let customEventPayload = adapter ? adapter.call(this, ev, ...args) : null;
 
 			// Handle either no adapter or a non-object return from the adapter
 			if (!customEventPayload || typeof customEventPayload !== 'object') {
@@ -751,8 +751,8 @@ const forwardCustom = handle.forwardCustom = (name, adapter) => handle(
 			return customEventPayload;
 		},
 		forward(name)
-	)
-).named('forwardCustom');
+	), 'forwardCustom');
+};
 
 /**
  * Creates a handler that will forward the event to a function at `name` on `props` with capability
@@ -795,12 +795,12 @@ const forwardCustom = handle.forwardCustom = (name, adapter) => handle(
  * @memberof core/handle
  * @private
  */
-const forwardCustomWithPrevent = handle.forwardCustomWithPrevent = named((name, adapter) => {
-	return (ev, ...args) => {
+const forwardCustomWithPrevent = handle.forwardCustomWithPrevent = function (name, adapter) {
+	return named(function (ev, ...args) {
 		let prevented = false;
 
-		const adapterWithPrevent = () => {
-			let customEventPayload = adapter ? adapter(ev, ...args) : null;
+		function adapterWithPrevent () {
+			let customEventPayload = adapter ? adapter.call(this, ev, ...args) : null;
 			let existingPreventDefault = null;
 
 			// Handle either no adapter or a non-object return from the adapter
@@ -822,11 +822,11 @@ const forwardCustomWithPrevent = handle.forwardCustomWithPrevent = named((name,
 			};
 
 			return customEventPayload;
-		};
+		}
 
-		return forwardCustom(name, adapterWithPrevent)(ev, ...args) && !prevented;
-	};
-}, 'forwardCustomWithPrevent');
+		return forwardCustom.call(this, name, adapterWithPrevent.bind(this))(ev, ...args) && !prevented;
+	}, 'forwardCustomWithPrevent');
+};
 
 /**
  * Accepts a handler and returns the logical complement of the value returned from the handler.

packages/core/handle/tests/handle-specs.js

@@ -1,3 +1,7 @@
+import PropTypes from 'prop-types';
+import {Component} from 'react';
+import {render} from '@testing-library/react';
+
 import {
 	adaptEvent,
 	call,
@@ -567,6 +571,90 @@ describe('handle', () => {
 
 			expect(actual).toEqual(expected);
 		});
+
+		test('should support bound adapter function', () => {
+			const handler = jest.fn();
+			const expected = 'ok';
+			const obj = {
+				data: expected,
+				adapter: function () {
+					return {
+						value: this?.data
+					};
+				}
+			};
+			const forwarderFn = forwardCustom('onCustomEvent', obj.adapter).bind(obj);
+			forwarderFn(null, {onCustomEvent: handler}, null);
+
+			const actual = handler.mock.calls[0][0];
+
+			expect(actual).toEqual(expect.objectContaining({
+				value: expected
+			}));
+		});
+
+		test('should support bound adapter function by call', () => {
+			const handler = jest.fn();
+			const expected = 'ok';
+			const obj = {
+				data: expected,
+				adapter: function () {
+					return {
+						value: this?.data
+					};
+				}
+			};
+
+			const forwarderFn = forwardCustom('onCustomEvent', call('adapter')).bind(obj);
+			forwarderFn(null, {onCustomEvent: handler}, null);
+
+			const actual = handler.mock.calls[0][0];
+
+			expect(actual).toEqual(expect.objectContaining({
+				value: expected
+			}));
+		});
+
+		test('should support bound adapter function by handle', () => {
+			const handler = jest.fn();
+			const expected = 'ok';
+
+			class TestComponent extends Component {
+				static propTypes = {
+					onCustomEvent: PropTypes.func
+				};
+
+				constructor (props) {
+					super(props);
+
+					this.data = expected;
+					handle(
+						forwardCustom('onCustomEvent', call('adapter'))
+					).bindAs(this, 'handleCustomEvent');
+				}
+
+				componentDidMount () {
+					this.handleCustomEvent(null, this.props, this.context);
+				}
+
+				adapter () {
+					return {
+						value: this?.data
+					};
+				}
+
+				render () {
+					return <div />;
+				}
+			}
+			render(<TestComponent onCustomEvent={handler} />);
+
+			const actual = handler.mock.calls[0][0];
+
+			expect(actual).toEqual(expect.objectContaining({
+				value: expected
+			}));
+		});
 	});
 
 	describe('#forwardCustomWithPrevent', () => {
@@ -647,6 +735,90 @@ describe('handle', () => {
 			expect(actual).toEqual(expected);
 		});
 
+		test('should support bound adapter function', () => {
+			const handler = jest.fn();
+			const expected = 'ok';
+			const obj = {
+				data: expected,
+				adapter: function () {
+					return {
+						value: this?.data
+					};
+				}
+			};
+			const forwarderFn = forwardCustomWithPrevent('onCustomEvent', obj.adapter).bind(obj);
+			forwarderFn(null, {onCustomEvent: handler}, null);
+
+			const actual = handler.mock.calls[0][0];
+
+			expect(actual).toEqual(expect.objectContaining({
+				value: expected
+			}));
+		});
+
+		test('should support bound adapter function by call', () => {
+			const handler = jest.fn();
+			const expected = 'ok';
+			const obj = {
+				data: expected,
+				adapter: function () {
+					return {
+						value: this?.data
+					};
+				}
+			};
+
+			const forwarderFn = forwardCustomWithPrevent('onCustomEvent', call('adapter')).bind(obj);
+			forwarderFn(null, {onCustomEvent: handler}, null);
+
+			const actual = handler.mock.calls[0][0];
+
+			expect(actual).toEqual(expect.objectContaining({
+				value: expected
+			}));
+		});
+
+		test('should support bound adapter function by handle', () => {
+			const handler = jest.fn();
+			const expected = 'ok';
+
+			class TestComponent extends Component {
+				static propTypes = {
+					onCustomEvent: PropTypes.func
+				};
+
+				constructor (props) {
+					super(props);
+
+					this.data = expected;
+					handle(
+						forwardCustomWithPrevent('onCustomEvent', call('adapter'))
+					).bindAs(this, 'handleCustomEvent');
+				}
+
+				componentDidMount () {
+					this.handleCustomEvent(null, this.props, this.context);
+				}
+
+				adapter () {
+					return {
+						value: this?.data
+					};
+				}
+
+				render () {
+					return <div />;
+				}
+			}
+			render(<TestComponent onCustomEvent={handler} />);
+
+			const actual = handler.mock.calls[0][0];
+
+			expect(actual).toEqual(expect.objectContaining({
+				value: expected
+			}));
+		});
+
 		test('should call the next handler when `preventDefault` from provided props hasn\'t been called', () => {
 			const event = 'onMyClick';
 			const handler = jest.fn();

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enact/core",
-  "version": "4.7.1",
+  "version": "4.7.2",
   "description": "Enact is an open source JavaScript framework containing everything you need to create a fast, scalable mobile or web application.",
   "repository": {
     "type": "git",

packages/core/platform/platform.js

@@ -52,6 +52,9 @@ const webOSVersion = {
 const platforms = [
 	// Windows Phone 7 - 10
 	{platform: 'windowsPhone', regex: /Windows Phone (?:OS )?(\d+)[.\d]+/},
+	// Edge
+	{platform: 'edge', regex: /Chrome\/(\d+)[.\d]+.*Edg(?:e|A|iOS)?\/(\d+)[.\d]+/},
+	{platform: 'edge', regex: /Edg(?:e|A|iOS)?\/(\d+)[.\d]+/},
 	// Android 4+ using Chrome
 	{platform: 'androidChrome', regex: /Android .* Chrome\/(\d+)[.\d]+/},
 	// Android 2 - 4
@@ -67,8 +70,6 @@ const platforms = [
 	{platform: 'ie', regex: /MSIE (\d+)/},
 	// IE 11
 	{platform: 'ie', regex: /Trident\/.*; rv:(\d+)/},
-	// Edge
-	{platform: 'edge', regex: /Edge\/(\d+)/},
 	// iOS 3 - 5
 	// Apple likes to make this complicated
 	{platform: 'ios', regex: /iP(?:hone|ad;(?: U;)? CPU) OS (\d+)/},
@@ -132,6 +133,9 @@ const parseUserAgent = (userAgent) => {
 				if (v >= 7 || v === -1) {
 					plat.chrome = Number(m[1]);
 				}
+			} else if (p.platform === 'edge' && m[2]) {
+				plat.chrome = Number(m[1]);
+				v = Number(m[2]);
 			} else {
 				v = Number(m[1]);
 			}
@@ -143,6 +147,7 @@ const parseUserAgent = (userAgent) => {
 				};
 			}
 			plat.platformName = p.platform;
+
 			break;
 		}
 	}