Skip to content

Commit 633368c

Browse files
Merge branch 'master' into lk/issues/2528-translator-typing-issues
2 parents 05d3deb + 9fb248f commit 633368c

File tree

7 files changed

+172
-175
lines changed

7 files changed

+172
-175
lines changed

MIGRATION.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ return this.t(label, label) as string;
4040

4141
This does not affect the Composition API where `Translator` is accessed directly from a `ComputedRef`.
4242

43+
### Angular material removes hammerjs
44+
45+
The angular material package no longer depends or imports the `hammerjs` package.
46+
`hammerjs` is a deprecated package for touch gesture support that was last updated 10 years ago.
47+
Thus, it is not expected to be in use. However, if you notice sudden failures in reaction to touch gestures, check if you are still using this.
48+
4349
## Migrating to JSON Forms 3.7
4450

4551
### Angular support now targets Angular 19 to 21

packages/angular-material/angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css"
2929
],
3030
"scripts": [],
31-
"allowedCommonJsDependencies": ["lodash", "hammerjs"],
31+
"allowedCommonJsDependencies": ["lodash"],
3232
"optimization": false,
3333
"buildOptimizer": false
3434
}

packages/angular-material/ng-package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"allowedNonPeerDependencies": [
55
"@jsonforms/angular",
66
"@jsonforms/core",
7-
"hammerjs",
87
"lodash"
98
]
10-
}
9+
}

packages/angular-material/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
"rxjs": "^6.6.0 || ^7.4.0"
7979
},
8080
"dependencies": {
81-
"hammerjs": "2.0.8",
8281
"lodash": "^4.17.21"
8382
},
8483
"devDependencies": {

packages/angular-material/src/library/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2323
THE SOFTWARE.
2424
*/
25-
import 'hammerjs';
2625
import { RankedTester } from '@jsonforms/core';
2726
export * from './module';
2827
import {

packages/vue-vuetify/src/util/composition.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@ export const useVuetifyControl = <
185185
const handleBlur = () => {
186186
touched.value = true;
187187
isFocused.value = false;
188+
if (changeEmitter && (changeEmitter as any).flush) {
189+
(changeEmitter as any).flush();
190+
}
188191
};
189192

190193
const jsonforms = useJsonForms();

pnpm-lock.yaml

Lines changed: 161 additions & 170 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)