Merge branch 'protectwise/main' into fran/sync-0.49.1

# Conflicts: # lerna.json # packages/troika-three-text/package.json
protectwise · Apr 25, 2024 · f529568 · f529568
2 parents 13dcd09 + d23f360
commit f529568
Show file tree

Hide file tree

Showing 38 changed files with 429 additions and 565 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.49.1](https://github.com/protectwise/troika/compare/v0.49.0...v0.49.1) (2024-04-09)
+
+
+### Bug Fixes
+
+* **instanced-uniforms-mesh:** remove listener on dispose ([#284](https://github.com/protectwise/troika/issues/284)) ([336075d](https://github.com/protectwise/troika/commit/336075de027e21ed1a9286c34185c9a0568053fe))
+* **troika-three-text:** Fix anchorY bottom-baseline. Closes [#309](https://github.com/protectwise/troika/issues/309) ([3457b03](https://github.com/protectwise/troika/commit/3457b03af5220886b4fd0534a1d44bdc5f837851))
+
+
+
+
+
+# [0.49.0](https://github.com/protectwise/troika/compare/v0.48.1...v0.49.0) (2023-10-08)
+
+
+### Bug Fixes
+
+* support opentype ccmp substitutions (glyph compositions) ([1e358b2](https://github.com/protectwise/troika/commit/1e358b23971914cd1a4d55e936dfe035dced57c1))
+
+
+### Features
+
+* add support for positioning of diacritic marks (e.g. Thai) ([301c34c](https://github.com/protectwise/troika/commit/301c34c3341b83eb95afc308bd796bcccb2f5ccd))
+
+
+
+
+
 ## [0.48.1](https://github.com/protectwise/troika/compare/v0.48.0...v0.48.1) (2023-10-02)
 
 

diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "1.0.0",
+  "version": "1.1.0",
   "command": {
     "version": {
       "conventionalCommits": true

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/three-instanced-uniforms-mesh/CHANGELOG.md b/packages/three-instanced-uniforms-mesh/CHANGELOG.md
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.49.1](https://github.com/protectwise/troika/compare/v0.49.0...v0.49.1) (2024-04-09)
+
+
+### Bug Fixes
+
+* **instanced-uniforms-mesh:** remove listener on dispose ([#284](https://github.com/protectwise/troika/issues/284)) ([336075d](https://github.com/protectwise/troika/commit/336075de027e21ed1a9286c34185c9a0568053fe))
+
+
+
+
+
+# [0.49.0](https://github.com/protectwise/troika/compare/v0.48.1...v0.49.0) (2023-10-08)
+
+**Note:** Version bump only for package three-instanced-uniforms-mesh
+
+
+
+
+
 # [0.48.0](https://github.com/protectwise/troika/compare/v0.47.2...v0.48.0) (2023-09-09)
 
 **Note:** Version bump only for package three-instanced-uniforms-mesh

diff --git a/packages/three-instanced-uniforms-mesh/package.json b/packages/three-instanced-uniforms-mesh/package.json
@@ -1,6 +1,6 @@
 {
   "name": "three-instanced-uniforms-mesh",
-  "version": "0.48.0",
+  "version": "0.49.1",
   "description": "Extension to Three.js InstancedMesh supporting per-instance uniform values",
   "author": "Jason Johnston <jason.johnston@protectwise.com>",
   "repository": {
@@ -14,7 +14,7 @@
   "module": "dist/three-instanced-uniforms-mesh.esm.js",
   "module:src": "src/index.js",
   "dependencies": {
-    "troika-three-utils": "^0.48.0"
+    "troika-three-utils": "^0.49.0"
   },
   "peerDependencies": {
     "three": ">=0.125.0"

diff --git a/packages/three-instanced-uniforms-mesh/src/InstancedUniformsMesh.js b/packages/three-instanced-uniforms-mesh/src/InstancedUniformsMesh.js
@@ -23,6 +23,7 @@ export class InstancedUniformsMesh extends InstancedMesh {
       derivedGeom.attributes = Object.create(baseGeom.attributes)
       // dispose the derived geometry when its base geometry is disposed:
       baseGeom.addEventListener('dispose', function onDispose () {
+        baseGeom.removeEventListener('dispose', onDispose)
         derivedGeom.dispose()
       })
     }

diff --git a/packages/troika-2d/CHANGELOG.md b/packages/troika-2d/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.49.0](https://github.com/protectwise/troika/compare/v0.48.1...v0.49.0) (2023-10-08)
+
+**Note:** Version bump only for package troika-2d
+
+
+
+
+
 # [0.48.0](https://github.com/protectwise/troika/compare/v0.47.2...v0.48.0) (2023-09-09)
 
 **Note:** Version bump only for package troika-2d

diff --git a/packages/troika-2d/package.json b/packages/troika-2d/package.json
@@ -1,6 +1,6 @@
 {
   "name": "troika-2d",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "description": "Troika 2D",
   "author": "Jason Johnston <jason.johnston@protectwise.com>",
   "repository": {
@@ -14,6 +14,6 @@
   "module": "dist/troika-2d.esm.js",
   "module:src": "src/index.js",
   "dependencies": {
-    "troika-core": "^0.48.0"
+    "troika-core": "^0.49.0"
   }
 }
diff --git a/packages/troika-3d-text/CHANGELOG.md b/packages/troika-3d-text/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.49.1](https://github.com/protectwise/troika/compare/v0.49.0...v0.49.1) (2024-04-09)
+
+**Note:** Version bump only for package troika-3d-text
+
+
+
+
+
+# [0.49.0](https://github.com/protectwise/troika/compare/v0.48.1...v0.49.0) (2023-10-08)
+
+**Note:** Version bump only for package troika-3d-text
+
+
+
+
+
 ## [0.48.1](https://github.com/protectwise/troika/compare/v0.48.0...v0.48.1) (2023-10-02)
 
 **Note:** Version bump only for package troika-3d-text

diff --git a/packages/troika-3d-text/package.json b/packages/troika-3d-text/package.json
@@ -1,6 +1,6 @@
 {
   "name": "troika-3d-text",
-  "version": "0.48.1",
+  "version": "0.49.1",
   "description": "SDF text for the Troika 3D scene management framework",
   "author": "Jason Johnston <jason.johnston@protectwise.com>",
   "repository": {
@@ -14,9 +14,9 @@
   "module": "dist/troika-3d-text.esm.js",
   "module:src": "src/index.js",
   "dependencies": {
-    "troika-3d": "^0.48.0",
-    "troika-three-text": "^0.48.1",
-    "troika-three-utils": "^0.48.0"
+    "troika-3d": "^0.49.0",
+    "troika-three-text": "^0.49.1",
+    "troika-three-utils": "^0.49.0"
   },
   "peerDependencies": {
     "three": ">=0.125.0"

diff --git a/packages/troika-3d-ui/CHANGELOG.md b/packages/troika-3d-ui/CHANGELOG.md
@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.49.1](https://github.com/protectwise/troika/compare/v0.49.0...v0.49.1) (2024-04-09)
+
+**Note:** Version bump only for package troika-3d-ui
+
+
+
+
+
+# [0.49.0](https://github.com/protectwise/troika/compare/v0.48.1...v0.49.0) (2023-10-08)
+
+**Note:** Version bump only for package troika-3d-ui
+
+
+
+
+
 ## [0.48.1](https://github.com/protectwise/troika/compare/v0.48.0...v0.48.1) (2023-10-02)
 
 **Note:** Version bump only for package troika-3d-ui

diff --git a/packages/troika-3d-ui/package.json b/packages/troika-3d-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "troika-3d-ui",
-  "version": "0.48.1",
+  "version": "0.49.1",
   "description": "Troika 3D User Interface Toolkit",
   "author": "Jason Johnston <jason.johnston@protectwise.com>",
   "repository": {
@@ -15,11 +15,11 @@
   "module:src": "src/index.js",
   "dependencies": {
     "object-path": "^0.11.4",
-    "troika-3d": "^0.48.0",
-    "troika-3d-text": "^0.48.1",
-    "troika-core": "^0.48.0",
-    "troika-flex-layout": "^0.48.1",
-    "troika-three-utils": "^0.48.0"
+    "troika-3d": "^0.49.0",
+    "troika-3d-text": "^0.49.1",
+    "troika-core": "^0.49.0",
+    "troika-flex-layout": "^0.49.1",
+    "troika-three-utils": "^0.49.0"
   },
   "peerDependencies": {
     "three": ">=0.125.0"

diff --git a/packages/troika-3d/CHANGELOG.md b/packages/troika-3d/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.49.0](https://github.com/protectwise/troika/compare/v0.48.1...v0.49.0) (2023-10-08)
+
+**Note:** Version bump only for package troika-3d
+
+
+
+
+
 # [0.48.0](https://github.com/protectwise/troika/compare/v0.47.2...v0.48.0) (2023-09-09)
 
 **Note:** Version bump only for package troika-3d

diff --git a/packages/troika-3d/package.json b/packages/troika-3d/package.json
@@ -1,6 +1,6 @@
 {
   "name": "troika-3d",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "description": "Troika 3D",
   "author": "Jason Johnston <jason.johnston@protectwise.com>",
   "repository": {
@@ -14,8 +14,8 @@
   "module": "dist/troika-3d.esm.js",
   "module:src": "src/index.js",
   "dependencies": {
-    "troika-core": "^0.48.0",
-    "troika-three-utils": "^0.48.0"
+    "troika-core": "^0.49.0",
+    "troika-three-utils": "^0.49.0"
   },
   "peerDependencies": {
     "three": ">=0.125.0"

diff --git a/packages/troika-animation/CHANGELOG.md b/packages/troika-animation/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.49.0](https://github.com/protectwise/troika/compare/v0.48.1...v0.49.0) (2023-10-08)
+
+**Note:** Version bump only for package troika-animation
+
+
+
+
+
 # [0.48.0](https://github.com/protectwise/troika/compare/v0.47.2...v0.48.0) (2023-09-09)
 
 **Note:** Version bump only for package troika-animation

diff --git a/packages/troika-animation/package.json b/packages/troika-animation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "troika-animation",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "description": "Troika Animation Utilities",
   "author": "Jason Johnston <jason.johnston@protectwise.com>",
   "repository": {

diff --git a/packages/troika-core/CHANGELOG.md b/packages/troika-core/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.49.0](https://github.com/protectwise/troika/compare/v0.48.1...v0.49.0) (2023-10-08)
+
+**Note:** Version bump only for package troika-core
+
+
+
+
+
 # [0.48.0](https://github.com/protectwise/troika/compare/v0.47.2...v0.48.0) (2023-09-09)
 
 **Note:** Version bump only for package troika-core

diff --git a/packages/troika-core/package.json b/packages/troika-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "troika-core",
-  "version": "0.48.0",
+  "version": "0.49.0",
   "description": "Troika Core",
   "author": "Jason Johnston <jason.johnston@protectwise.com>",
   "repository": {
@@ -15,7 +15,7 @@
   "module:src": "src/index.js",
   "dependencies": {
     "prop-types": "^15.6.2",
-    "troika-animation": "^0.48.0"
+    "troika-animation": "^0.49.0"
   },
   "peerDependencies": {
     "react": "^16.5.2",