Skip to content

Commit 6d2ae50

Browse files
Replaced ember-resize-observer-service with ember-primitives/resize-observer (#277)
* Replace ember-resize-observer-service with a v2 addon, which eliminates the last v1 addon in this library * Fix this scoping * Reduce diff * Update docs-app * chore: Added lockfile * chore: Added changeset --------- Co-authored-by: Isaac Lee <16869656+ijlee2@users.noreply.github.com>
1 parent e45521f commit 6d2ae50

File tree

6 files changed

+237
-21
lines changed

6 files changed

+237
-21
lines changed

.changeset/pretty-wings-rest.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"ember-container-query": patch
3+
"docs-app": patch
4+
"test-app": patch
5+
---
6+
7+
Replaced ember-resize-observer-service with ember-primitives/resize-observer

docs-app/app/modifiers/draw-stacked-chart.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
/* eslint-disable @typescript-eslint/unbound-method, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return */
44
import { registerDestructor } from '@ember/destroyable';
55
import { action } from '@ember/object';
6-
import { type Registry as Services, service } from '@ember/service';
76
import { extent, max, rollup, ticks } from 'd3-array';
87
import { axisBottom, axisLeft } from 'd3-axis';
98
import { scaleBand, scaleLinear, scaleOrdinal } from 'd3-scale';
@@ -15,6 +14,7 @@ import {
1514
formatRevenue,
1615
} from 'docs-app/utils/components/widgets/widget-2';
1716
import Modifier from 'ember-modifier';
17+
import { resizeObserver } from 'ember-primitives/resize-observer';
1818

1919
const musicFormats = Object.keys(COLOR_PALETTE);
2020
const paletteColors = Object.values(COLOR_PALETTE);
@@ -29,11 +29,11 @@ interface DrawStackedChartSignature {
2929
}
3030

3131
export default class DrawStackedChartModifier extends Modifier<DrawStackedChartSignature> {
32-
@service declare resizeObserver: Services['resize-observer'];
33-
3432
_element = undefined;
3533
_named = {};
3634
height = 0;
35+
resizeObserver = resizeObserver(this);
36+
3737
width = 0;
3838

3939
get color() {

docs-app/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@
9292
"ember-load-initializers": "^3.0.1",
9393
"ember-modifier": "^4.2.2",
9494
"ember-page-title": "^9.0.3",
95+
"ember-primitives": "^0.42.1",
9596
"ember-qunit": "^9.0.4",
9697
"ember-resolver": "^13.1.1",
9798
"ember-source": "~6.8.1",

packages/ember-container-query/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"decorator-transforms": "^2.3.0",
6868
"ember-element-helper": "^0.8.8",
6969
"ember-modifier": "^4.2.2",
70-
"ember-resize-observer-service": "^1.1.0"
70+
"ember-primitives": "^0.42.1"
7171
},
7272
"devDependencies": {
7373
"@babel/core": "^7.28.5",

packages/ember-container-query/src/modifiers/container-query.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { registerDestructor } from '@ember/destroyable';
22
import { action } from '@ember/object';
33
import type Owner from '@ember/owner';
44
import { debounce as _debounce } from '@ember/runloop';
5-
import { service } from '@ember/service';
65
import type { ArgsFor, NamedArgs, PositionalArgs } from 'ember-modifier';
76
import Modifier from 'ember-modifier';
7+
import { resizeObserver } from 'ember-primitives/resize-observer';
88

99
type IndexSignatureParameter = string | number | symbol;
1010
type ObjectEntry<T> = [keyof T, T[keyof T]];
@@ -48,12 +48,11 @@ interface ContainerQuerySignature<T extends IndexSignatureParameter> {
4848
export default class ContainerQuery<
4949
T extends IndexSignatureParameter,
5050
> extends Modifier<ContainerQuerySignature<T>> {
51-
@service declare private readonly resizeObserver;
52-
5351
private _dataAttributes: string[] = [];
5452
private _element?: Element;
5553
private _named!: NamedArgs<ContainerQuerySignature<T>>;
5654

55+
#resizeObserver = resizeObserver(this);
5756
dimensions!: Dimensions;
5857
queryResults!: QueryResults<T>;
5958

@@ -73,7 +72,9 @@ export default class ContainerQuery<
7372
super(owner, args);
7473

7574
registerDestructor(this, () => {
76-
this.resizeObserver.unobserve(this._element, this.onResize);
75+
if (this._element) {
76+
this.#resizeObserver.unobserve(this._element, this.onResize);
77+
}
7778
});
7879
}
7980

@@ -127,10 +128,12 @@ export default class ContainerQuery<
127128
}
128129

129130
private registerResizeObserver(element: Element): void {
130-
this.resizeObserver.unobserve(this._element, this.onResize);
131+
if (this._element) {
132+
this.#resizeObserver.unobserve(this._element, this.onResize);
133+
}
131134

132135
this._element = element;
133-
this.resizeObserver.observe(this._element, this.onResize);
136+
this.#resizeObserver.observe(this._element, this.onResize);
134137
}
135138

136139
private resetDataAttributes(element: Element): void {

0 commit comments

Comments
 (0)