@spectrum-web-components/grid 0.41.2 → 0.42.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spectrum-web-components/grid",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.42.1",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -64,8 +64,8 @@
|
|
|
64
64
|
"dependencies": {
|
|
65
65
|
"@lit-labs/observers": "^2.0.0",
|
|
66
66
|
"@lit-labs/virtualizer": "^2.0.6",
|
|
67
|
-
"@spectrum-web-components/base": "^0.
|
|
68
|
-
"@spectrum-web-components/reactive-controllers": "^0.
|
|
67
|
+
"@spectrum-web-components/base": "^0.42.1",
|
|
68
|
+
"@spectrum-web-components/reactive-controllers": "^0.42.1",
|
|
69
69
|
"lit": "^2.5.0"
|
|
70
70
|
},
|
|
71
71
|
"types": "./src/index.d.ts",
|
|
@@ -74,5 +74,5 @@
|
|
|
74
74
|
"./sp-*.js",
|
|
75
75
|
"./**/*.dev.js"
|
|
76
76
|
],
|
|
77
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "c7ab5516e86d20194e92114afd04affa490b7248"
|
|
78
78
|
}
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
import { ResizeController } from "@lit-labs/observers/resize-controller.js";
|
|
3
3
|
import { RovingTabindexController } from "@spectrum-web-components/reactive-controllers/src/RovingTabindex.js";
|
|
4
|
+
const doCallbackAfterPaint = (cb) => {
|
|
5
|
+
requestAnimationFrame(() => {
|
|
6
|
+
requestAnimationFrame(() => {
|
|
7
|
+
cb();
|
|
8
|
+
});
|
|
9
|
+
});
|
|
10
|
+
};
|
|
4
11
|
export class GridController {
|
|
5
12
|
constructor(host, {
|
|
6
13
|
elements,
|
|
@@ -13,13 +20,6 @@ export class GridController {
|
|
|
13
20
|
// Last visible element
|
|
14
21
|
this._last = 0;
|
|
15
22
|
this.handleFocusin = (event) => {
|
|
16
|
-
const doCallbackAfterPaint = (cb) => {
|
|
17
|
-
requestAnimationFrame(() => {
|
|
18
|
-
requestAnimationFrame(() => {
|
|
19
|
-
cb();
|
|
20
|
-
});
|
|
21
|
-
});
|
|
22
|
-
};
|
|
23
23
|
const scrollToFirst = () => this.host.scrollToIndex(0);
|
|
24
24
|
const focusIntoGrid = () => {
|
|
25
25
|
this.focus();
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["GridController.ts"],
|
|
4
|
-
"sourcesContent": ["/*\nCopyright 2020 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\nimport type { ReactiveController } from 'lit';\n\nimport { ResizeController } from '@lit-labs/observers/resize-controller.js';\nimport { RovingTabindexController } from '@spectrum-web-components/reactive-controllers/src/RovingTabindex.js';\nimport {\n RangeChangedEvent,\n VisibilityChangedEvent,\n} from '@lit-labs/virtualizer/events.js';\nimport { Grid } from './Grid.dev.js'\n\ninterface ItemSize {\n width: number;\n height: number;\n}\n\nexport class GridController<T extends HTMLElement>\n implements ReactiveController\n{\n host!: Grid;\n\n resizeController!: ResizeController;\n\n rovingTabindexController!: RovingTabindexController<T>;\n\n get itemSize(): ItemSize {\n return this._itemSize();\n }\n\n /* c8 ignore next 6 */\n private _itemSize(): ItemSize {\n return {\n width: 100,\n height: 100,\n };\n }\n\n // First visible element\n _first = 0;\n\n get gap(): string | undefined {\n return this._gap();\n }\n\n /* c8 ignore next 3 */\n private _gap(): string | undefined {\n return undefined;\n }\n\n get padding(): string | undefined {\n return this._padding();\n }\n\n /* c8 ignore next 3 */\n private _padding(): string | undefined {\n return undefined;\n }\n\n // Last visible element\n _last = 0;\n\n constructor(\n host: Grid,\n {\n elements,\n itemSize,\n gap,\n padding,\n }: {\n elements: () => T[];\n itemSize: ItemSize | (() => ItemSize);\n gap?: string | (() => string);\n padding?: string | (() => string);\n }\n ) {\n this.host = host;\n this.host.addController(this);\n this.applyLayout(itemSize, gap, padding);\n this.resizeController = new ResizeController(this.host, {\n callback: (entries: ResizeObserverEntry[]): void => {\n entries.forEach((entry) => {\n this.measureDirectionLength(entry.contentRect);\n });\n },\n });\n this.rovingTabindexController = new RovingTabindexController<T>(\n this.host,\n {\n direction: 'grid',\n elements,\n focusInIndex: () => {\n const activeElement = (this.host.getRootNode() as Document)\n .activeElement as HTMLElement;\n return activeElement === this.host ? 0 : -1;\n },\n }\n );\n }\n\n public focus(options?: FocusOptions): void {\n this.rovingTabindexController.focus(options);\n }\n\n protected applyLayout(\n itemSize: ItemSize | (() => ItemSize),\n gap?: string | (() => string),\n padding?: string | (() => string)\n ): void {\n /* c8 ignore next 2 */\n if (typeof itemSize === 'object') {\n this._itemSize = () => itemSize;\n } else if (\n typeof itemSize === 'function' &&\n typeof itemSize() !== 'undefined'\n ) {\n this._itemSize = itemSize;\n }\n /* c8 ignore next 2 */\n if (typeof gap === 'string') {\n this._gap = () => gap;\n } else if (typeof gap === 'function') {\n this._gap = gap;\n }\n /* c8 ignore next 2 */\n if (typeof padding === 'string') {\n this._padding = () => padding;\n } else if (typeof padding === 'function') {\n this._padding = padding;\n }\n }\n\n public update({\n elements,\n itemSize,\n gap,\n padding,\n }: {\n elements: () => T[];\n itemSize: ItemSize | (() => ItemSize);\n gap?: string | (() => string);\n padding?: string | (() => string);\n }): void {\n this.rovingTabindexController.update({ elements });\n this.applyLayout(itemSize, gap, padding);\n const contentRect = this.host.getBoundingClientRect();\n this.measureDirectionLength(contentRect);\n }\n\n protected measureDirectionLength(contentRect: DOMRect): void {\n const gap = this.gap ? parseFloat(this.gap) : 0;\n const padding = this.padding ? parseFloat(this.padding) : 0;\n const contentBoxWidth = contentRect.width - padding * 2;\n // There is always one less gap per row than items.\n const directionLength =\n Math.floor(\n (contentBoxWidth - this.itemSize.width) /\n (gap + this.itemSize.width)\n ) + 1;\n this.rovingTabindexController.directionLength =\n Math.floor(directionLength);\n }\n\n protected handleFocusin = (event: FocusEvent): void => {\n const
|
|
5
|
-
"mappings": ";AAaA,SAAS,wBAAwB;AACjC,SAAS,gCAAgC;
|
|
4
|
+
"sourcesContent": ["/*\nCopyright 2020 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\nimport type { ReactiveController } from 'lit';\n\nimport { ResizeController } from '@lit-labs/observers/resize-controller.js';\nimport { RovingTabindexController } from '@spectrum-web-components/reactive-controllers/src/RovingTabindex.js';\nimport {\n RangeChangedEvent,\n VisibilityChangedEvent,\n} from '@lit-labs/virtualizer/events.js';\nimport { Grid } from './Grid.dev.js'\n\ninterface ItemSize {\n width: number;\n height: number;\n}\n\nconst doCallbackAfterPaint = (cb: () => void): void => {\n requestAnimationFrame(() => {\n requestAnimationFrame(() => {\n cb();\n });\n });\n};\n\nexport class GridController<T extends HTMLElement>\n implements ReactiveController\n{\n host!: Grid;\n\n resizeController!: ResizeController;\n\n rovingTabindexController!: RovingTabindexController<T>;\n\n get itemSize(): ItemSize {\n return this._itemSize();\n }\n\n /* c8 ignore next 6 */\n private _itemSize(): ItemSize {\n return {\n width: 100,\n height: 100,\n };\n }\n\n // First visible element\n _first = 0;\n\n get gap(): string | undefined {\n return this._gap();\n }\n\n /* c8 ignore next 3 */\n private _gap(): string | undefined {\n return undefined;\n }\n\n get padding(): string | undefined {\n return this._padding();\n }\n\n /* c8 ignore next 3 */\n private _padding(): string | undefined {\n return undefined;\n }\n\n // Last visible element\n _last = 0;\n\n constructor(\n host: Grid,\n {\n elements,\n itemSize,\n gap,\n padding,\n }: {\n elements: () => T[];\n itemSize: ItemSize | (() => ItemSize);\n gap?: string | (() => string);\n padding?: string | (() => string);\n }\n ) {\n this.host = host;\n this.host.addController(this);\n this.applyLayout(itemSize, gap, padding);\n this.resizeController = new ResizeController(this.host, {\n callback: (entries: ResizeObserverEntry[]): void => {\n entries.forEach((entry) => {\n this.measureDirectionLength(entry.contentRect);\n });\n },\n });\n this.rovingTabindexController = new RovingTabindexController<T>(\n this.host,\n {\n direction: 'grid',\n elements,\n focusInIndex: () => {\n const activeElement = (this.host.getRootNode() as Document)\n .activeElement as HTMLElement;\n return activeElement === this.host ? 0 : -1;\n },\n }\n );\n }\n\n public focus(options?: FocusOptions): void {\n this.rovingTabindexController.focus(options);\n }\n\n protected applyLayout(\n itemSize: ItemSize | (() => ItemSize),\n gap?: string | (() => string),\n padding?: string | (() => string)\n ): void {\n /* c8 ignore next 2 */\n if (typeof itemSize === 'object') {\n this._itemSize = () => itemSize;\n } else if (\n typeof itemSize === 'function' &&\n typeof itemSize() !== 'undefined'\n ) {\n this._itemSize = itemSize;\n }\n /* c8 ignore next 2 */\n if (typeof gap === 'string') {\n this._gap = () => gap;\n } else if (typeof gap === 'function') {\n this._gap = gap;\n }\n /* c8 ignore next 2 */\n if (typeof padding === 'string') {\n this._padding = () => padding;\n } else if (typeof padding === 'function') {\n this._padding = padding;\n }\n }\n\n public update({\n elements,\n itemSize,\n gap,\n padding,\n }: {\n elements: () => T[];\n itemSize: ItemSize | (() => ItemSize);\n gap?: string | (() => string);\n padding?: string | (() => string);\n }): void {\n this.rovingTabindexController.update({ elements });\n this.applyLayout(itemSize, gap, padding);\n const contentRect = this.host.getBoundingClientRect();\n this.measureDirectionLength(contentRect);\n }\n\n protected measureDirectionLength(contentRect: DOMRect): void {\n const gap = this.gap ? parseFloat(this.gap) : 0;\n const padding = this.padding ? parseFloat(this.padding) : 0;\n const contentBoxWidth = contentRect.width - padding * 2;\n // There is always one less gap per row than items.\n const directionLength =\n Math.floor(\n (contentBoxWidth - this.itemSize.width) /\n (gap + this.itemSize.width)\n ) + 1;\n this.rovingTabindexController.directionLength =\n Math.floor(directionLength);\n }\n\n protected handleFocusin = (event: FocusEvent): void => {\n const scrollToFirst = (): void => this.host.scrollToIndex(0);\n const focusIntoGrid = (): void => {\n this.focus();\n this.host.tabIndex = -1;\n };\n if ((event.target as HTMLElement) === this.host) {\n if (this._first > 0) {\n doCallbackAfterPaint(() => {\n scrollToFirst();\n doCallbackAfterPaint(focusIntoGrid);\n });\n } else {\n doCallbackAfterPaint(focusIntoGrid);\n }\n }\n };\n\n protected handleFocusout = (event: FocusEvent): void => {\n if (\n !event.relatedTarget ||\n !this.host.contains(event.relatedTarget as HTMLElement)\n ) {\n this.host.tabIndex = 0;\n }\n };\n\n protected handleRangeChanged = (event: RangeChangedEvent): void => {\n this.rovingTabindexController.clearElementCache(event.first);\n };\n\n protected handleVisibleChanged = (event: VisibilityChangedEvent): void => {\n this._first = event.first;\n this._last = event.last;\n };\n\n public hostConnected(): void {\n this.host.addEventListener('rangeChanged', this.handleRangeChanged);\n this.host.addEventListener(\n 'visibilityChanged',\n this.handleVisibleChanged\n );\n this.host.addEventListener('focusin', this.handleFocusin);\n this.host.addEventListener('focusout', this.handleFocusout);\n this.host.tabIndex = 0;\n this.host.style.setProperty('outline', 'none', 'important');\n }\n\n public hostDisconnected(): void {\n this.host.removeEventListener('rangeChanged', this.handleRangeChanged);\n this.host.removeEventListener(\n 'visibilityChanged',\n this.handleVisibleChanged\n );\n this.host.removeEventListener('focusin', this.handleFocusin);\n this.host.removeEventListener('focusout', this.handleFocusout);\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/src/GridController.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
"use strict";import{ResizeController as
|
|
1
|
+
"use strict";import{ResizeController as a}from"@lit-labs/observers/resize-controller.js";import{RovingTabindexController as l}from"@spectrum-web-components/reactive-controllers/src/RovingTabindex.js";const o=r=>{requestAnimationFrame(()=>{requestAnimationFrame(()=>{r()})})};export class GridController{constructor(t,{elements:i,itemSize:e,gap:n,padding:s}){this._first=0;this._last=0;this.handleFocusin=t=>{const i=()=>this.host.scrollToIndex(0),e=()=>{this.focus(),this.host.tabIndex=-1};t.target===this.host&&(this._first>0?o(()=>{i(),o(e)}):o(e))};this.handleFocusout=t=>{(!t.relatedTarget||!this.host.contains(t.relatedTarget))&&(this.host.tabIndex=0)};this.handleRangeChanged=t=>{this.rovingTabindexController.clearElementCache(t.first)};this.handleVisibleChanged=t=>{this._first=t.first,this._last=t.last};this.host=t,this.host.addController(this),this.applyLayout(e,n,s),this.resizeController=new a(this.host,{callback:h=>{h.forEach(d=>{this.measureDirectionLength(d.contentRect)})}}),this.rovingTabindexController=new l(this.host,{direction:"grid",elements:i,focusInIndex:()=>this.host.getRootNode().activeElement===this.host?0:-1})}get itemSize(){return this._itemSize()}_itemSize(){return{width:100,height:100}}get gap(){return this._gap()}_gap(){}get padding(){return this._padding()}_padding(){}focus(t){this.rovingTabindexController.focus(t)}applyLayout(t,i,e){typeof t=="object"?this._itemSize=()=>t:typeof t=="function"&&typeof t()!="undefined"&&(this._itemSize=t),typeof i=="string"?this._gap=()=>i:typeof i=="function"&&(this._gap=i),typeof e=="string"?this._padding=()=>e:typeof e=="function"&&(this._padding=e)}update({elements:t,itemSize:i,gap:e,padding:n}){this.rovingTabindexController.update({elements:t}),this.applyLayout(i,e,n);const s=this.host.getBoundingClientRect();this.measureDirectionLength(s)}measureDirectionLength(t){const i=this.gap?parseFloat(this.gap):0,e=this.padding?parseFloat(this.padding):0,n=t.width-e*2,s=Math.floor((n-this.itemSize.width)/(i+this.itemSize.width))+1;this.rovingTabindexController.directionLength=Math.floor(s)}hostConnected(){this.host.addEventListener("rangeChanged",this.handleRangeChanged),this.host.addEventListener("visibilityChanged",this.handleVisibleChanged),this.host.addEventListener("focusin",this.handleFocusin),this.host.addEventListener("focusout",this.handleFocusout),this.host.tabIndex=0,this.host.style.setProperty("outline","none","important")}hostDisconnected(){this.host.removeEventListener("rangeChanged",this.handleRangeChanged),this.host.removeEventListener("visibilityChanged",this.handleVisibleChanged),this.host.removeEventListener("focusin",this.handleFocusin),this.host.removeEventListener("focusout",this.handleFocusout)}}
|
|
2
2
|
//# sourceMappingURL=GridController.js.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["GridController.ts"],
|
|
4
|
-
"sourcesContent": ["/*\nCopyright 2020 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\nimport type { ReactiveController } from 'lit';\n\nimport { ResizeController } from '@lit-labs/observers/resize-controller.js';\nimport { RovingTabindexController } from '@spectrum-web-components/reactive-controllers/src/RovingTabindex.js';\nimport {\n RangeChangedEvent,\n VisibilityChangedEvent,\n} from '@lit-labs/virtualizer/events.js';\nimport { Grid } from './Grid.js';\n\ninterface ItemSize {\n width: number;\n height: number;\n}\n\nexport class GridController<T extends HTMLElement>\n implements ReactiveController\n{\n host!: Grid;\n\n resizeController!: ResizeController;\n\n rovingTabindexController!: RovingTabindexController<T>;\n\n get itemSize(): ItemSize {\n return this._itemSize();\n }\n\n /* c8 ignore next 6 */\n private _itemSize(): ItemSize {\n return {\n width: 100,\n height: 100,\n };\n }\n\n // First visible element\n _first = 0;\n\n get gap(): string | undefined {\n return this._gap();\n }\n\n /* c8 ignore next 3 */\n private _gap(): string | undefined {\n return undefined;\n }\n\n get padding(): string | undefined {\n return this._padding();\n }\n\n /* c8 ignore next 3 */\n private _padding(): string | undefined {\n return undefined;\n }\n\n // Last visible element\n _last = 0;\n\n constructor(\n host: Grid,\n {\n elements,\n itemSize,\n gap,\n padding,\n }: {\n elements: () => T[];\n itemSize: ItemSize | (() => ItemSize);\n gap?: string | (() => string);\n padding?: string | (() => string);\n }\n ) {\n this.host = host;\n this.host.addController(this);\n this.applyLayout(itemSize, gap, padding);\n this.resizeController = new ResizeController(this.host, {\n callback: (entries: ResizeObserverEntry[]): void => {\n entries.forEach((entry) => {\n this.measureDirectionLength(entry.contentRect);\n });\n },\n });\n this.rovingTabindexController = new RovingTabindexController<T>(\n this.host,\n {\n direction: 'grid',\n elements,\n focusInIndex: () => {\n const activeElement = (this.host.getRootNode() as Document)\n .activeElement as HTMLElement;\n return activeElement === this.host ? 0 : -1;\n },\n }\n );\n }\n\n public focus(options?: FocusOptions): void {\n this.rovingTabindexController.focus(options);\n }\n\n protected applyLayout(\n itemSize: ItemSize | (() => ItemSize),\n gap?: string | (() => string),\n padding?: string | (() => string)\n ): void {\n /* c8 ignore next 2 */\n if (typeof itemSize === 'object') {\n this._itemSize = () => itemSize;\n } else if (\n typeof itemSize === 'function' &&\n typeof itemSize() !== 'undefined'\n ) {\n this._itemSize = itemSize;\n }\n /* c8 ignore next 2 */\n if (typeof gap === 'string') {\n this._gap = () => gap;\n } else if (typeof gap === 'function') {\n this._gap = gap;\n }\n /* c8 ignore next 2 */\n if (typeof padding === 'string') {\n this._padding = () => padding;\n } else if (typeof padding === 'function') {\n this._padding = padding;\n }\n }\n\n public update({\n elements,\n itemSize,\n gap,\n padding,\n }: {\n elements: () => T[];\n itemSize: ItemSize | (() => ItemSize);\n gap?: string | (() => string);\n padding?: string | (() => string);\n }): void {\n this.rovingTabindexController.update({ elements });\n this.applyLayout(itemSize, gap, padding);\n const contentRect = this.host.getBoundingClientRect();\n this.measureDirectionLength(contentRect);\n }\n\n protected measureDirectionLength(contentRect: DOMRect): void {\n const gap = this.gap ? parseFloat(this.gap) : 0;\n const padding = this.padding ? parseFloat(this.padding) : 0;\n const contentBoxWidth = contentRect.width - padding * 2;\n // There is always one less gap per row than items.\n const directionLength =\n Math.floor(\n (contentBoxWidth - this.itemSize.width) /\n (gap + this.itemSize.width)\n ) + 1;\n this.rovingTabindexController.directionLength =\n Math.floor(directionLength);\n }\n\n protected handleFocusin = (event: FocusEvent): void => {\n const
|
|
5
|
-
"mappings": "aAaA,OAAS,oBAAAA,MAAwB,2CACjC,OAAS,4BAAAC,MAAgC,
|
|
6
|
-
"names": ["ResizeController", "RovingTabindexController", "
|
|
4
|
+
"sourcesContent": ["/*\nCopyright 2020 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\nimport type { ReactiveController } from 'lit';\n\nimport { ResizeController } from '@lit-labs/observers/resize-controller.js';\nimport { RovingTabindexController } from '@spectrum-web-components/reactive-controllers/src/RovingTabindex.js';\nimport {\n RangeChangedEvent,\n VisibilityChangedEvent,\n} from '@lit-labs/virtualizer/events.js';\nimport { Grid } from './Grid.js';\n\ninterface ItemSize {\n width: number;\n height: number;\n}\n\nconst doCallbackAfterPaint = (cb: () => void): void => {\n requestAnimationFrame(() => {\n requestAnimationFrame(() => {\n cb();\n });\n });\n};\n\nexport class GridController<T extends HTMLElement>\n implements ReactiveController\n{\n host!: Grid;\n\n resizeController!: ResizeController;\n\n rovingTabindexController!: RovingTabindexController<T>;\n\n get itemSize(): ItemSize {\n return this._itemSize();\n }\n\n /* c8 ignore next 6 */\n private _itemSize(): ItemSize {\n return {\n width: 100,\n height: 100,\n };\n }\n\n // First visible element\n _first = 0;\n\n get gap(): string | undefined {\n return this._gap();\n }\n\n /* c8 ignore next 3 */\n private _gap(): string | undefined {\n return undefined;\n }\n\n get padding(): string | undefined {\n return this._padding();\n }\n\n /* c8 ignore next 3 */\n private _padding(): string | undefined {\n return undefined;\n }\n\n // Last visible element\n _last = 0;\n\n constructor(\n host: Grid,\n {\n elements,\n itemSize,\n gap,\n padding,\n }: {\n elements: () => T[];\n itemSize: ItemSize | (() => ItemSize);\n gap?: string | (() => string);\n padding?: string | (() => string);\n }\n ) {\n this.host = host;\n this.host.addController(this);\n this.applyLayout(itemSize, gap, padding);\n this.resizeController = new ResizeController(this.host, {\n callback: (entries: ResizeObserverEntry[]): void => {\n entries.forEach((entry) => {\n this.measureDirectionLength(entry.contentRect);\n });\n },\n });\n this.rovingTabindexController = new RovingTabindexController<T>(\n this.host,\n {\n direction: 'grid',\n elements,\n focusInIndex: () => {\n const activeElement = (this.host.getRootNode() as Document)\n .activeElement as HTMLElement;\n return activeElement === this.host ? 0 : -1;\n },\n }\n );\n }\n\n public focus(options?: FocusOptions): void {\n this.rovingTabindexController.focus(options);\n }\n\n protected applyLayout(\n itemSize: ItemSize | (() => ItemSize),\n gap?: string | (() => string),\n padding?: string | (() => string)\n ): void {\n /* c8 ignore next 2 */\n if (typeof itemSize === 'object') {\n this._itemSize = () => itemSize;\n } else if (\n typeof itemSize === 'function' &&\n typeof itemSize() !== 'undefined'\n ) {\n this._itemSize = itemSize;\n }\n /* c8 ignore next 2 */\n if (typeof gap === 'string') {\n this._gap = () => gap;\n } else if (typeof gap === 'function') {\n this._gap = gap;\n }\n /* c8 ignore next 2 */\n if (typeof padding === 'string') {\n this._padding = () => padding;\n } else if (typeof padding === 'function') {\n this._padding = padding;\n }\n }\n\n public update({\n elements,\n itemSize,\n gap,\n padding,\n }: {\n elements: () => T[];\n itemSize: ItemSize | (() => ItemSize);\n gap?: string | (() => string);\n padding?: string | (() => string);\n }): void {\n this.rovingTabindexController.update({ elements });\n this.applyLayout(itemSize, gap, padding);\n const contentRect = this.host.getBoundingClientRect();\n this.measureDirectionLength(contentRect);\n }\n\n protected measureDirectionLength(contentRect: DOMRect): void {\n const gap = this.gap ? parseFloat(this.gap) : 0;\n const padding = this.padding ? parseFloat(this.padding) : 0;\n const contentBoxWidth = contentRect.width - padding * 2;\n // There is always one less gap per row than items.\n const directionLength =\n Math.floor(\n (contentBoxWidth - this.itemSize.width) /\n (gap + this.itemSize.width)\n ) + 1;\n this.rovingTabindexController.directionLength =\n Math.floor(directionLength);\n }\n\n protected handleFocusin = (event: FocusEvent): void => {\n const scrollToFirst = (): void => this.host.scrollToIndex(0);\n const focusIntoGrid = (): void => {\n this.focus();\n this.host.tabIndex = -1;\n };\n if ((event.target as HTMLElement) === this.host) {\n if (this._first > 0) {\n doCallbackAfterPaint(() => {\n scrollToFirst();\n doCallbackAfterPaint(focusIntoGrid);\n });\n } else {\n doCallbackAfterPaint(focusIntoGrid);\n }\n }\n };\n\n protected handleFocusout = (event: FocusEvent): void => {\n if (\n !event.relatedTarget ||\n !this.host.contains(event.relatedTarget as HTMLElement)\n ) {\n this.host.tabIndex = 0;\n }\n };\n\n protected handleRangeChanged = (event: RangeChangedEvent): void => {\n this.rovingTabindexController.clearElementCache(event.first);\n };\n\n protected handleVisibleChanged = (event: VisibilityChangedEvent): void => {\n this._first = event.first;\n this._last = event.last;\n };\n\n public hostConnected(): void {\n this.host.addEventListener('rangeChanged', this.handleRangeChanged);\n this.host.addEventListener(\n 'visibilityChanged',\n this.handleVisibleChanged\n );\n this.host.addEventListener('focusin', this.handleFocusin);\n this.host.addEventListener('focusout', this.handleFocusout);\n this.host.tabIndex = 0;\n this.host.style.setProperty('outline', 'none', 'important');\n }\n\n public hostDisconnected(): void {\n this.host.removeEventListener('rangeChanged', this.handleRangeChanged);\n this.host.removeEventListener(\n 'visibilityChanged',\n this.handleVisibleChanged\n );\n this.host.removeEventListener('focusin', this.handleFocusin);\n this.host.removeEventListener('focusout', this.handleFocusout);\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["ResizeController", "RovingTabindexController", "doCallbackAfterPaint", "cb", "host", "elements", "itemSize", "gap", "padding", "event", "scrollToFirst", "focusIntoGrid", "entries", "entry", "options", "contentRect", "contentBoxWidth", "directionLength"]
|
|
7
7
|
}
|
package/test/grid-memory.test.js
CHANGED
|
@@ -1,43 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
import {
|
|
3
|
-
import { html, render } from "@spectrum-web-components/base";
|
|
2
|
+
import { fixture } from "@open-wc/testing";
|
|
4
3
|
import { Default } from "../stories/grid.stories.js";
|
|
5
|
-
import {
|
|
6
|
-
|
|
7
|
-
it("releases references on disconnect", async function() {
|
|
8
|
-
if (!window.gc || !("measureUserAgentSpecificMemory" in performance))
|
|
9
|
-
this.skip();
|
|
10
|
-
this.timeout(1e4);
|
|
11
|
-
const iterations = 50;
|
|
12
|
-
let active = false;
|
|
13
|
-
const el = await fixture(
|
|
14
|
-
html`
|
|
15
|
-
<div></div>
|
|
16
|
-
`
|
|
17
|
-
);
|
|
18
|
-
async function toggle(forced = void 0) {
|
|
19
|
-
active = forced != null ? forced : !active;
|
|
20
|
-
render(active ? Default() : html``, el);
|
|
21
|
-
await nextFrame();
|
|
22
|
-
await nextFrame();
|
|
23
|
-
}
|
|
24
|
-
for (let i = 0; i < 5; i++) {
|
|
25
|
-
await toggle();
|
|
26
|
-
}
|
|
27
|
-
await toggle(false);
|
|
28
|
-
const beforeMB = await usedHeapMB();
|
|
29
|
-
for (let i = 0; i < iterations; i++) {
|
|
30
|
-
await toggle();
|
|
31
|
-
}
|
|
32
|
-
await toggle(false);
|
|
33
|
-
const afterMB = await usedHeapMB();
|
|
34
|
-
expect(
|
|
35
|
-
afterMB.total - beforeMB.total,
|
|
36
|
-
`Total | before: ${beforeMB.total}, after: ${afterMB.total}
|
|
37
|
-
DOM | before: ${beforeMB.dom}, after: ${afterMB.dom}
|
|
38
|
-
JS | before: ${beforeMB.js}, after: ${afterMB.js}
|
|
39
|
-
Shared | before: ${beforeMB.shared}, after: ${afterMB.shared}`
|
|
40
|
-
).to.be.lte(0);
|
|
41
|
-
});
|
|
42
|
-
});
|
|
4
|
+
import { testForMemoryLeaks } from "../../../test/testing-helpers.js";
|
|
5
|
+
testForMemoryLeaks(async () => await fixture(Default()));
|
|
43
6
|
//# sourceMappingURL=grid-memory.test.js.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["grid-memory.test.ts"],
|
|
4
|
-
"sourcesContent": ["/*\nCopyright 2023 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\n\nimport {
|
|
5
|
-
"mappings": ";AAYA,SAAS,
|
|
4
|
+
"sourcesContent": ["/*\nCopyright 2023 Adobe. All rights reserved.\nThis file is licensed to you under the Apache License, Version 2.0 (the \"License\");\nyou may not use this file except in compliance with the License. You may obtain a copy\nof the License at http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under\nthe License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS\nOF ANY KIND, either express or implied. See the License for the specific language\ngoverning permissions and limitations under the License.\n*/\n\nimport { fixture } from '@open-wc/testing';\nimport { Default } from '../stories/grid.stories.js';\nimport { Grid } from '@spectrum-web-components/grid';\nimport { testForMemoryLeaks } from '../../../test/testing-helpers.js';\n\ntestForMemoryLeaks(async () => await fixture<Grid>(Default()));\n"],
|
|
5
|
+
"mappings": ";AAYA,SAAS,eAAe;AACxB,SAAS,eAAe;AAExB,SAAS,0BAA0B;AAEnC,mBAAmB,YAAY,MAAM,QAAc,QAAQ,CAAC,CAAC;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|