+
{itemRenderer({...childProps, ...componentProps, index})}
);
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 9f11d2fe0d..744da243c1 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@enact/ui",
- "version": "4.9.0",
+ "version": "5.0.0-alpha.2",
"description": "A collection of simplified unstyled cross-platform UI components for Enact",
"repository": {
"type": "git",
@@ -11,7 +11,7 @@
"main": "index.js",
"scripts": {
"clean": "enact clean",
- "interlink": "npm link ../core",
+ "interlink": "npm link ../core ../i18n",
"lint": "enact lint --strict",
"test": "enact test",
"test-json": "enact test --json",
@@ -32,9 +32,10 @@
}
},
"dependencies": {
- "@enact/core": "^4.9.0",
+ "@enact/core": "^5.0.0-alpha.2",
+ "@enact/i18n": "^5.0.0-alpha.2",
"classnames": "^2.5.1",
- "direction": "^1.0.4",
+ "ilib": "^14.20.0",
"invariant": "^2.2.4",
"prop-types": "^15.8.1",
"ramda": "^0.30.1",
diff --git a/packages/webos/CHANGELOG.md b/packages/webos/CHANGELOG.md
index 32040a85b5..becd9c98eb 100644
--- a/packages/webos/CHANGELOG.md
+++ b/packages/webos/CHANGELOG.md
@@ -2,12 +2,40 @@
The following is a curated list of changes in the Enact webos module, newest changes on the top.
+## [5.0.0-alpha.2] - 2024-10-08
+
+### Added
+
+- `webos/signLang` module with `startSignLang()`, `stopSignLang()` functions and `SignLangDecorator` Higher-order Component
+
+## [4.9.2] - 2024-09-26
+
+No significant changes.
+
+## [4.9.1] - 2024-09-09
+
+### Added
+
+- `webos/signLang` module with `startSignLang()`, `stopSignLang()` functions and `SignLangDecorator` Higher-order Component
+
+## [4.7.12] - 2024-09-05
+
+### Added
+
+- `webos/signLang` module with `startSignLang()`, `stopSignLang()` functions and `SignLangDecorator` Higher-order Component
+
## [4.9.0] - 2024-07-17
### Fixed
- `webos/speech.VoiceControlDecorator` to not remount its children when it rerenders
+## [5.0.0-alpha.1] - 2024-07-11
+
+### Removed
+
+- `webos/platform` member `watch` and `legacy`
+
## [4.9.0-beta.1] - 2024-06-17
No significant changes.
diff --git a/packages/webos/package.json b/packages/webos/package.json
index 4d4446d2cf..f1b7e6a7b4 100644
--- a/packages/webos/package.json
+++ b/packages/webos/package.json
@@ -1,6 +1,6 @@
{
"name": "@enact/webos",
- "version": "4.9.0",
+ "version": "5.0.0-alpha.2",
"description": "webOS support library",
"repository": {
"type": "git",
@@ -32,7 +32,7 @@
}
},
"dependencies": {
- "@enact/core": "^4.9.0",
+ "@enact/core": "^5.0.0-alpha.2",
"prop-types": "^15.8.1",
"react": "^18.3.1",
"react-dom": "^18.3.1"
diff --git a/packages/webos/platform/platform.js b/packages/webos/platform/platform.js
index 5849fd87c8..bafc609668 100644
--- a/packages/webos/platform/platform.js
+++ b/packages/webos/platform/platform.js
@@ -6,8 +6,6 @@
* @exports platform
*/
-import deprecate from '@enact/core/internal/deprecate';
-
const webOSVersion = [
// Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) QtWebEngine/5.2.1 Chrome/38.0.2125.122 Safari/537.36 WebAppManager
{chrome: 38, version: 3},
@@ -24,10 +22,7 @@ const webOSVersion = [
];
const platforms = [
- // LG webOS before adapting Chrome
- {regex: /Web0S;.*Safari\/537.41/, version: 1}, // using WebKit 537.41 for WebAppManager, using Chrome 26 for the browser app
- {regex: /Web0S;.*Safari\/538.2/, version: 2}, // using WebKit 538.2 for WebAppManager, using Chrome 34 for the browser app
- // LG webOS using Chrome
+ // LG webOS using Chrome (from version 3)
...webOSVersion.map(({chrome, version}) => ({regex: new RegExp(`Web0S;.*Chrome/${chrome}`), version, chrome})),
{regex: /Web0S;.*Chrome\/(\d+)/},
// Fallback
@@ -38,28 +33,14 @@ const parseUserAgent = (userAgent) => {
// build out our cached platform determination for future usage
const platformInfo = {webos: false};
- if (userAgent.indexOf('SmartWatch') > -1) {
- platformInfo.watch = true;
- } else if (userAgent.indexOf('SmartTV') > -1) {
- platformInfo.tv = true;
- } else if (userAgent.indexOf('Large Screen') > -1) {
- deprecate({
- name: 'Detecting webOS TV by "Large Screen" from the user agent string',
- until: '5.0.0'
- });
+ if (userAgent.indexOf('SmartTV') > -1) {
platformInfo.tv = true;
} else {
const webOSSystem = window.webOSSystem ?? window.PalmSystem;
try {
let legacyInfo = JSON.parse(webOSSystem.deviceInfo || '{}');
- if (legacyInfo.platformVersionMajor && legacyInfo.platformVersionMinor) {
- let major = parseInt(legacyInfo.platformVersionMajor);
- let minor = parseInt(legacyInfo.platformVersionMinor);
- if (major < 3 || (major === 3 && minor <= 0)) {
- platformInfo.legacy = true;
- } else {
- platformInfo.open = true;
- }
+ if (typeof legacyInfo.platformVersionMajor !== 'undefined' && typeof legacyInfo.platformVersionMinor !== 'undefined') {
+ platformInfo.open = true;
} else {
platformInfo.unknown = true;
}
@@ -124,9 +105,7 @@ function detect () {
* @type {Object}
* @property {Boolean} webos `true` for webOS
* @property {Boolean} [tv] `true` for LG webOS SmartTV
- * @property {Boolean} [watch] `true` for LG webOS SmartWatch. Deprecated: will be removed in 5.0.0.
* @property {Boolean} [open] `true` for Open webOS
- * @property {Boolean} [legacy] `true` for legacy webOS (Palm and HP hardware). Deprecated: will be removed in 5.0.0.
* @property {Boolean} [unknown] `true` for any unknown system
* @property {Number} [version] The version of the platform if detected
* @property {Number} [chrome] The version of Chrome if detected
@@ -137,9 +116,7 @@ const platform = {};
[
'tv',
- 'watch',
'open',
- 'legacy',
'unknown',
'version',
'chrome'
@@ -147,10 +124,6 @@ const platform = {};
Object.defineProperty(platform, name, {
enumerable: true,
get: () => {
- if (name === 'watch' || name === 'legacy') {
- deprecate({name, until: '5.0.0'});
- }
-
const p = detect();
return p[name];
}
diff --git a/packages/webos/platform/tests/platform-specs.js b/packages/webos/platform/tests/platform-specs.js
index cc83c94ede..0d036689a6 100644
--- a/packages/webos/platform/tests/platform-specs.js
+++ b/packages/webos/platform/tests/platform-specs.js
@@ -4,8 +4,6 @@ describe('platform', () => {
describe('parseUserAgent for webOS', () => {
// From http://webostv.developer.lge.com/discover/specifications/web-engine/
- const webOSTV1 = 'Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.41 (KHTML, like Gecko) Large Screen WebAppManager Safari/537.41';
- const webOSTV2 = 'Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/538.2 (KHTML, like Gecko) Large Screen WebAppManager Safari/538.2';
const webOSTV3 = 'Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) QtWebEngine/5.2.1 Chrome/38.0.2125.122 Safari/537.36 WebAppManager';
const webOSTV4 = 'Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/53.0.2785.34 Safari/537.36 WebAppManager';
const webOSTV5 = 'Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.106 Safari/537.36 WebAppManager';
@@ -15,20 +13,6 @@ describe('platform', () => {
const webOSTVChrome = 'Mozilla/5.0 (Web0S; Linux/SmartTV) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 WebAppManager';
const webOSOther = 'Mozilla/5.0 (Web0S; Linux) AppleWebKit/537.36 (KHTML, like Gecko) Safari/537.36 WebAppManager';
- test('should detect webOS 1', () => {
- const expected = {version: 1};
- const actual = parseUserAgent(webOSTV1);
-
- expect(actual).toMatchObject(expected);
- });
-
- test('should detect webOS 2', () => {
- const expected = {version: 2};
- const actual = parseUserAgent(webOSTV2);
-
- expect(actual).toMatchObject(expected);
- });
-
test('should detect webOS 3', () => {
const expected = {version: 3};
const actual = parseUserAgent(webOSTV3);
diff --git a/packages/webos/signLang/SignLangDecorator.js b/packages/webos/signLang/SignLangDecorator.js
new file mode 100644
index 0000000000..4afcd77629
--- /dev/null
+++ b/packages/webos/signLang/SignLangDecorator.js
@@ -0,0 +1,136 @@
+import {forward} from '@enact/core/handle';
+import hoc from '@enact/core/hoc';
+import PropTypes from 'prop-types';
+import {Component} from 'react';
+
+import {startSignLang, stopSignLang} from './signLang';
+
+/**
+ * Default config for {@link webos/signLang.SignLangDecorator}
+ *
+ * @type {Object}
+ * @hocconfig
+ * @memberof webos/signLang.SignLangDecorator
+ */
+const defaultConfig = {
+ /**
+ * Time to wait (in milliseconds) before calling Sign Language API.
+ *
+ * @type {Number}
+ * @default 0
+ * @memberof webos/signLang.SignLangDecorator.defaultConfig
+ * @public
+ */
+ signLangDelay: 0
+};
+
+/**
+ * Usage:
+ * ```
+ * import Button from '@enact/sandstone/Button';
+ * import {SignLangDecorator} from '@enact/webos/signLang';
+ * import {Component} from 'react';
+ *
+ * const SignLangButton = SignLangDecorator(Button);
+ *
+ * class Sample extends Component {
+ * render () {
+ * return(
+ *
+ * Hello
+ *
+ * );
+ * }
+ * }
+ * ```
+ *
+ * SignLangDecorator is a higher order component that adds feature for sign language
+ * to its wrapped component.
+ *
+ * @class SignLangDecorator
+ * @memberof webos/signLang
+ * @hoc
+ * @public
+ */
+const SignLangDecorator = hoc(defaultConfig, (config, Wrapped) => {
+ const {signLangDelay} = config;
+ const forwardBlur = forward('onBlur');
+ const forwardFocus = forward('onFocus');
+
+ return class extends Component {
+ static displayName = 'SignLangDecorator';
+
+ static propTypes = /** @lends webos/signLang.SignLangDecorator.prototype */ {
+ /**
+ * Unique ID for sign language.
+ *
+ * @type {String}
+ * @public
+ */
+ signLangId: PropTypes.string,
+
+ /**
+ * Additional option for sign language.
+ *
+ * @type {Object}
+ * @public
+ */
+ signLangOption: PropTypes.object
+ };
+
+ constructor (props) {
+ super(props);
+
+ this.signLangDelayId = null;
+ }
+
+ requestSignLang = (active) => {
+ const {signLangId = '', signLangOption = {}} = this.props;
+
+ if (signLangId.length > 0) {
+ if (active) {
+ if (signLangDelay === 0) {
+ startSignLang(signLangId, signLangOption);
+ } else {
+ clearTimeout(this.signLangDelayId);
+ this.signLangDelayId = setTimeout(() => {
+ startSignLang(signLangId, signLangOption);
+ }, signLangDelay);
+ }
+ } else {
+ if (signLangDelay > 0) clearTimeout(this.signLangDelayId);
+ stopSignLang(signLangId, signLangOption);
+ }
+ }
+ };
+
+ onFocus = (ev) => {
+ forwardFocus(ev, this.props);
+ this.requestSignLang(true);
+ };
+
+ onBlur = (ev) => {
+ forwardBlur(ev, this.props);
+ this.requestSignLang(false);
+ };
+
+ render () {
+ const props = Object.assign({}, this.props);
+ delete props.onBlur;
+ delete props.onFocus;
+ delete props.signLangId;
+ delete props.signLangOption;
+
+ return (
+
+ );
+ }
+ };
+});
+
+export default SignLangDecorator;
+export {SignLangDecorator};
diff --git a/packages/webos/signLang/index.js b/packages/webos/signLang/index.js
new file mode 100644
index 0000000000..f970d2d9f1
--- /dev/null
+++ b/packages/webos/signLang/index.js
@@ -0,0 +1,17 @@
+/**
+ * Provide utility functions and higher order component for sign language.
+ *
+ * @module webos/signLang
+ * @exports SignLangDecorator
+ * @exports startSignLang
+ * @exports stopSignLang
+ */
+
+import {startSignLang, stopSignLang} from './signLang';
+import SignLangDecorator from './SignLangDecorator';
+
+export {
+ SignLangDecorator,
+ startSignLang,
+ stopSignLang
+};
diff --git a/packages/webos/signLang/package.json b/packages/webos/signLang/package.json
new file mode 100644
index 0000000000..f68471d544
--- /dev/null
+++ b/packages/webos/signLang/package.json
@@ -0,0 +1,3 @@
+{
+ "main": "index.js"
+}
diff --git a/packages/webos/signLang/signLang.js b/packages/webos/signLang/signLang.js
new file mode 100644
index 0000000000..9c7b82294b
--- /dev/null
+++ b/packages/webos/signLang/signLang.js
@@ -0,0 +1,109 @@
+/* eslint-disable no-console */
+import {info} from '@enact/webos/pmloglib';
+
+import LS2Request from '../LS2Request';
+import {platform} from '../platform';
+
+let signLangEnabled = null;
+let appId = '';
+
+const checkSignLang = () => new Promise((resolve, reject) => {
+ if (signLangEnabled === null) {
+ new LS2Request().send({
+ service: 'luna://com.webos.settingsservice',
+ method: 'getSystemSettings',
+ subscribe: true,
+ parameters: {
+ 'keys': ['signLanguageGuidance'],
+ 'category': 'option'
+ },
+ onSuccess: function (res) {
+ info('enact_signLang_checkSignLang', {'onSuccess': res}, '');
+
+ if (res && res.settings.signLanguageGuidance === 'on') {
+ signLangEnabled = true;
+ appId = typeof window == 'object' && window.PalmSystem && window.PalmSystem.getIdentifier && window.PalmSystem.getIdentifier();
+ resolve();
+ return;
+ }
+
+ signLangEnabled = false;
+ reject();
+ },
+ onFailure: function (err) {
+ info('enact_signLang_checkSignLang', {'onFailure': err}, '');
+
+ reject('Failed to get sign language setting value: ' + JSON.stringify(err));
+ }
+ });
+ } else if (signLangEnabled) {
+ resolve();
+ } else {
+ reject();
+ }
+});
+
+const callSignLangAPI = (signLangId, active, option) => () => new Promise((resolve, reject) => {
+ const parameters = {appId, 'signGuidanceId': signLangId, 'focusOut': !active, ...option};
+
+ info('enact_signLang_callSignLangAPI', parameters, '');
+
+ new LS2Request().send({
+ service: 'luna://com.webos.service.signlanguageavatar',
+ method: 'play',
+ parameters,
+ onSuccess: resolve,
+ onFailure: (err) => {
+ info('enact_signLang_callSignLangAPI', {'onFailure': err}, '');
+
+ reject('Failed to callSignLangAPI: ' + JSON.stringify(err));
+ }
+ });
+});
+
+const requestSignLang = (signLangId, active, option = {}) => {
+ if (platform.tv) {
+ checkSignLang()
+ .then(callSignLangAPI(signLangId, active, option))
+ .catch(message => {
+ if (message) {
+ console.error(`Failed to requestSignLang: ${message}`);
+ }
+ });
+ } else {
+ console.warn('Platform doesn\'t support sing language.');
+ }
+};
+
+/**
+ * Activates sign language based on the singLangID.
+ *
+ * @function
+ * @param {String} [signLangId=''] signLangId Unique ID used for sign language.
+ * @param {Object} [option={}] Additional option for sign language.
+ * @returns {undefined}
+ * @memberof webos/signLang
+ * @public
+ */
+const startSignLang = (signLangId = '', option = {}) => {
+ requestSignLang(signLangId, true, option);
+};
+
+/**
+ * Deactivates sign language based on the signLangID.
+ *
+ * @function
+ * @param {String} [signLangId=''] signLangId Unique ID used for sign language.
+ * @param {Object} [option={}] Additional option for sign language.
+ * @returns {undefined}
+ * @memberof webos/signLang
+ * @public
+ */
+const stopSignLang = (signLangId = '', option = {}) => {
+ requestSignLang(signLangId, false, option);
+};
+
+export {
+ startSignLang,
+ stopSignLang
+};