Merge branch '1.0.0'

mayakwd · Jan 13, 2022 · c2b828c · c2b828c
2 parents b5728d0 + 22cc683
commit c2b828c
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -4,5 +4,6 @@
   "singleQuote": true,
   "printWidth": 120,
   "useTabs": false,
-  "tabWidth": 2
+  "tabWidth": 2,
+  "endOfLine": "crlf"
 }
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - "11"
+  - "16"
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.15.2
   - export PATH=$HOME/.yarn/bin:$PATH

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,8 @@
 All notable changes to this project will be documented in this file.
 
 # 1.0.0 - 2022-01-13
-- Feature: Codebase migrated to Pixi.JS v6 
+- Feature: Codebase migrated to Pixi.JS v6
+- Fix: Fixed `addChild` method signature compatibility
 
 # 0.0.43 - 2021-09-21
 - Feature: Added allow deselection for single-selection mode 

diff --git a/package.json b/package.json
@@ -48,13 +48,13 @@
     "@pixi/loaders": "^6.2.0",
     "@pixi/app": "^6.2.0",
     "ts-jest": "^26.2.0",
-    "eslint": "^8.4.1",
-    "typescript": "^4.5.3",
+    "eslint": "^8.6.0",
+    "typescript": "^4.5.4",
     "gsap": "^3.5.0",
     "tslib": "^2.3.1",
-    "@typescript-eslint/eslint-plugin": "^5.6.0",
-    "@typescript-eslint/parser": "^5.6.0",
-    "eslint-config-airbnb-typescript-prettier": "^4.2.0",
+    "@typescript-eslint/eslint-plugin": "^5.9.1",
+    "@typescript-eslint/parser": "^5.9.1",
+    "eslint-config-airbnb-typescript-prettier": "^5.0.0",
     "husky": "^7.0.4",
     "prettier": "^2.5.1"
   },

diff --git a/src/yooai/containers/AbstractBox.ts b/src/yooai/containers/AbstractBox.ts
@@ -96,13 +96,14 @@ export abstract class AbstractBox extends Pane {
     super(parent, x, y);
   }
 
-  public addChild<T extends DisplayObject>(...children: [T, ...DisplayObject[]]): T {
+  public addChild<T extends DisplayObject[]>(...children: T): T[0] {
     children.forEach((child) => {
       if (isComponent(child)) {
         child.on('resize', this.invalidateSize, this);
       }
     });
-    return super.addChild(...children);
+    const [firstChild, ...rest] = children;
+    return super.addChild(firstChild, ...rest);
   }
 
   public addChildAt<T extends DisplayObject>(child: T, index: number): T {

diff --git a/src/yooai/containers/BaseScrollPane.ts b/src/yooai/containers/BaseScrollPane.ts
@@ -4,7 +4,6 @@ import { invalidate } from '../..';
 import { Pane } from './Pane';
 
 export abstract class BaseScrollPane extends Pane {
-
   protected _contentScrollRect: Rectangle = new Rectangle();
   protected _contentWidth: number = 0;
   protected _contentHeight: number = 0;

diff --git a/src/yooai/popup/PopupManager.ts b/src/yooai/popup/PopupManager.ts
@@ -8,7 +8,6 @@ import { DisplayObjectWithSize } from '../display/DisplayObjectWithSize';
 import { getHeight, getWidth } from '../layout/utils';
 
 export class PopupManager {
-
   private static createWrapper(color: number, alpha: number): DisplayObjectWithSize {
     const quad = new Graphics();
     quad.beginFill(color, alpha);