Merge pull request #408 from rdkcentral/release/5.5.0

Release/5.5.0

Author: michielvandergeest

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v5.5.0
+
+*26 oct 2023*
+
+- Added colors type definitions ([#394](https://github.com/rdkcentral/Lightning-SDK/issues/394))
+- Added support to allow Colors to take ARGB values([#399](https://github.com/rdkcentral/Lightning-SDK/issues/399))
+- Added condition for c2d upon app close([#403](https://github.com/rdkcentral/Lightning-SDK/issues/403))
+- Fixed Router cross fade issue([#406](https://github.com/rdkcentral/Lightning-SDK/issues/406))
+
 ## v5.4.1
 
 *30 aug 2023*

docs/changelog.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v5.5.0
+
+*26 oct 2023*
+
+- Added colors type definitions ([#394](https://github.com/rdkcentral/Lightning-SDK/issues/394))
+- Added support to allow Colors to take ARGB values([#399](https://github.com/rdkcentral/Lightning-SDK/issues/399))
+- Added condition for c2d upon app close([#403](https://github.com/rdkcentral/Lightning-SDK/issues/403))
+- Fixed Router cross fade issue([#406](https://github.com/rdkcentral/Lightning-SDK/issues/406))
+
 ## v5.4.1
 
 *30 aug 2023*

docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "5.4.1",
+  "version": "5.5.0",
   "license": "Apache-2.0",
   "types": "index.d.ts",
   "scripts": {

index.d.ts

@@ -22,7 +22,7 @@ export const Ads: any; // export { default as Ads } from './src/Ads'
 export { AppData, FontFaceDefinition } from './src/Application/index.js';
 export { default as Application } from './src/Application/index.js';
 export const AudioPlayer: any; // export { default as AudioPlayer } from './src/AudioPlayer'
-export const Colors: any; // export { default as Colors } from './src/Colors'
+export { default as Colors } from './src/Colors'
 export { default as Img } from './src/Img/index.js';
 export const Keyboard: any; // export { default as Keyboard } from './src/Keyboard'
 export { default as Launch } from './src/Launch/index.js';

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightningjs/sdk",
-  "version": "5.4.1",
+  "version": "5.5.0",
   "license": "Apache-2.0",
   "types": "index.d.ts",
   "scripts": {

package.json

@@ -0,0 +1,16 @@
+export type ColorTransform = {
+  alpha(value: number): ColorTransform;
+  hue(value: number): ColorTransform;
+  lightness(value: number): ColorTransform;
+  saturation(value: number): ColorTransform;
+  lighter(value: number): ColorTransform;
+  darker(value: number): ColorTransform;
+  mix(color: string, percentage: number): ColorTransform;
+  get(): number;
+};
+
+export type Colors = {
+  (colorName: string): ColorTransform;
+} & {
+  [colorName: string]: ColorTransform;
+};

src/Colors/index.d.ts

@@ -79,7 +79,7 @@ const normalizeColorToARGB = color => {
   if (!targetColor) {
     targetColor = color
   }
-  const check = /^#([0-9A-F]{3}|[0-9A-F]{6})$/i
+  const check = /^#([0-9A-F]{3}|[0-9A-F]{6}|[0-9A-F]{8})$/i
   if (isString(targetColor) && check.test(targetColor)) {
     let hex = check.exec(targetColor)[1]
     if (hex.length === 3) {
@@ -90,7 +90,7 @@ const normalizeColorToARGB = color => {
         })
         .join('')
     }
-    targetColor = `0xff${hex}` * 1
+    targetColor = (hex.length === 8 ? `0x${hex}` : `0xff${hex}`) * 1
   }
   if (!normalizedColors[color]) {
     normalizedColors[color] = targetColor

src/Colors/index.js

@@ -433,8 +433,8 @@ const cleanUp = (page, request) => {
       x: 0,
       y: 0,
       scale: 1,
-      alpha: 1,
       visible: false,
+      alpha: 1,
     })
   }
 }

src/Router/utils/router.js

@@ -112,7 +112,7 @@ const getSettings = () => {
             if (stage.gl) {
               stage.gl.clearColor(0.0, 0.0, 0.0, 0.0)
               stage.gl.clear(stage.gl.COLOR_BUFFER_BIT)
-            } else {
+            } else if(stage.c2d) {
               stage.c2d.clearRect(0, 0, canvas.width, canvas.height)
             }
           }