From 25dd06e791292bb7aeae3d032e0911c4021e7e28 Mon Sep 17 00:00:00 2001
From: TheCymaera <69355340+TheCymaera@users.noreply.github.com>
Date: Fri, 11 Nov 2022 03:30:48 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20support=20for=20resize=20ob?=
 =?UTF-8?q?server=20bindings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/compiler/compile/nodes/Binding.ts         |  3 +-
 src/compiler/compile/nodes/Element.ts         |  7 ++-
 .../render_dom/wrappers/Element/Binding.ts    | 12 +++++
 .../render_dom/wrappers/Element/index.ts      | 30 +++++++++--
 src/compiler/utils/patterns.ts                |  5 ++
 .../internal/ResizeObserverSingleton.ts       | 50 ++++++++++++-------
 src/runtime/internal/dom.ts                   | 47 ++++++++++-------
 7 files changed, 111 insertions(+), 43 deletions(-)

diff --git a/src/compiler/compile/nodes/Binding.ts b/src/compiler/compile/nodes/Binding.ts
index f826df4828..f253d847a2 100644
--- a/src/compiler/compile/nodes/Binding.ts
+++ b/src/compiler/compile/nodes/Binding.ts
@@ -3,7 +3,7 @@ import get_object from '../utils/get_object';
 import Expression from './shared/Expression';
 import Component from '../Component';
 import TemplateScope from './shared/TemplateScope';
-import { regex_dimensions } from '../../utils/patterns';
+import { regex_dimensions, regex_box_size } from '../../utils/patterns';
 import { Node as ESTreeNode } from 'estree';
 import { TemplateNode } from '../../interfaces';
 import Element from './Element';
@@ -89,6 +89,7 @@ export default class Binding extends Node {
 
 		this.is_readonly =
 			regex_dimensions.test(this.name) ||
+			regex_box_size.test(this.name) ||
 			(isElement(parent) &&
 				((parent.is_media_node() && read_only_media_attributes.has(this.name)) ||
 					(parent.name === 'input' && type === 'file')) /* TODO others? */);
diff --git a/src/compiler/compile/nodes/Element.ts b/src/compiler/compile/nodes/Element.ts
index ca9bcb8c4e..903de939bb 100644
--- a/src/compiler/compile/nodes/Element.ts
+++ b/src/compiler/compile/nodes/Element.ts
@@ -11,7 +11,7 @@ import StyleDirective from './StyleDirective';
 import Text from './Text';
 import { namespaces } from '../../utils/namespaces';
 import map_children from './shared/map_children';
-import { regex_dimensions, regex_starts_with_newline, regex_non_whitespace_character } from '../../utils/patterns';
+import { regex_dimensions, regex_starts_with_newline, regex_non_whitespace_character, regex_box_size, regex_border_box_size, regex_content_box_size } from '../../utils/patterns';
 import fuzzymatch from '../../utils/fuzzymatch';
 import list from '../../utils/list';
 import Let from './Let';
@@ -907,7 +907,10 @@ export default class Element extends Node {
 				} else if (contenteditable && !contenteditable.is_static) {
 					return component.error(contenteditable, compiler_errors.dynamic_contenteditable_attribute);
 				}
-			} else if (name !== 'this') {
+			} else if (
+				name !== 'this' &&
+				!regex_box_size.test(name)
+			) {
 				return component.error(binding, compiler_errors.invalid_binding(binding.name));
 			}
 		});
diff --git a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
index 9e2ec85f0f..46f1cfc043 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/Binding.ts
@@ -11,6 +11,7 @@ import { Node, Identifier } from 'estree';
 import add_to_set from '../../../utils/add_to_set';
 import mark_each_block_bindings from '../shared/mark_each_block_bindings';
 import handle_select_value_binding from './handle_select_value_binding';
+import { regex_box_size } from '../../../../utils/patterns.js';
 
 export default class BindingWrapper {
 	node: Binding;
@@ -413,6 +414,17 @@ function get_value_from_dom(
 		return x`$$value`;
 	}
 
+	// <div bind:contentRect|contentBoxSize|borderBoxSize|devicePixelContentBoxSize>
+	if (regex_box_size.test(name)) {
+		const functionName = {
+			"contentRect": "get_content_rect",
+			"contentBoxSize": "get_content_box_size",
+			"borderBoxSize": "get_border_box_size",
+			"devicePixelContentBoxSize": "get_device_pixel_content_box_size",
+		}
+		return x`@${functionName}(this)`;
+	}
+
 	// <select bind:value='selected>
 	if (node.name === 'select') {
 		return node.get_static_attribute_value('multiple') === true ?
diff --git a/src/compiler/compile/render_dom/wrappers/Element/index.ts b/src/compiler/compile/render_dom/wrappers/Element/index.ts
index 8d0429879e..9cab8d20dc 100644
--- a/src/compiler/compile/render_dom/wrappers/Element/index.ts
+++ b/src/compiler/compile/render_dom/wrappers/Element/index.ts
@@ -12,7 +12,7 @@ import { namespaces } from '../../../../utils/namespaces';
 import AttributeWrapper from './Attribute';
 import StyleAttributeWrapper from './StyleAttribute';
 import SpreadAttributeWrapper from './SpreadAttribute';
-import { regex_dimensions, regex_starts_with_newline, regex_backslashes } from '../../../../utils/patterns';
+import { regex_dimensions, regex_starts_with_newline, regex_backslashes, regex_border_box_size, regex_content_box_size, regex_device_pixel_content_box_size } from '../../../../utils/patterns';
 import Binding from './Binding';
 import add_to_set from '../../../utils/add_to_set';
 import { add_event_handler } from '../shared/add_event_handlers';
@@ -70,6 +70,22 @@ const events = [
 			regex_dimensions.test(name)
 	},
 
+	{
+		event_names: ['elementresizeobserveborderbox'],
+		filter: (_node: Element, name: string) =>
+			regex_border_box_size.test(name)
+	},
+	{
+		event_names: ['elementresizeobservecontentbox'],
+		filter: (_node: Element, name: string) =>
+			regex_content_box_size.test(name)
+	},
+	{
+		event_names: ['elementresizeobservedevicepixelcontentbox'],
+		filter: (_node: Element, name: string) =>
+			regex_device_pixel_content_box_size.test(name)
+	},
+
 	// media events
 	{
 		event_names: ['timeupdate'],
@@ -688,13 +704,19 @@ export default class ElementWrapper extends Wrapper {
 		`);
 
 		binding_group.events.forEach(name => {
-			if (name === 'elementresize') {
-				// special case
+			if (name.startsWith('elementresize')) {
 				const resize_listener = block.get_unique_name(`${this.var.name}_resize_listener`);
 				block.add_variable(resize_listener);
 
+				const functionName = ({
+					"elementresize": "add_iframe_resize_listener",
+					"elementresizeobservecontentbox": "add_content_box_observer",
+					"elementresizeobserveborderbox": "add_border_box_observer",
+					"elementresizeobservedevicepixelcontentbox": "add_device_pixel_content_box_observer",
+				})[name]
+
 				block.chunks.mount.push(
-					b`${resize_listener} = @add_resize_listener(${this.var}, ${callee}.bind(${this.var}));`
+					b`${resize_listener} = @${functionName}(${this.var}, ${callee}.bind(${this.var}));`
 				);
 
 				block.chunks.destroy.push(
diff --git a/src/compiler/utils/patterns.ts b/src/compiler/utils/patterns.ts
index 9429d47227..2a19d2d89f 100644
--- a/src/compiler/utils/patterns.ts
+++ b/src/compiler/utils/patterns.ts
@@ -22,3 +22,8 @@ export const regex_ends_with_underscore = /_$/;
 export const regex_invalid_variable_identifier_characters = /[^a-zA-Z0-9_$]/g;
 
 export const regex_dimensions = /^(?:offset|client)(?:Width|Height)$/;
+
+export const regex_content_box_size = /^(?:contentRect|contentBoxSize)$/;
+export const regex_border_box_size = /^(?:borderBoxSize)$/;
+export const regex_device_pixel_content_box_size = /^(?:devicePixelContentBoxSize)$/;
+export const regex_box_size = /^(?:contentRect|contentBoxSize|borderBoxSize|devicePixelContentBoxSize)$/
\ No newline at end of file
diff --git a/src/runtime/internal/ResizeObserverSingleton.ts b/src/runtime/internal/ResizeObserverSingleton.ts
index 5492dfe07e..beaaeede05 100644
--- a/src/runtime/internal/ResizeObserverSingleton.ts
+++ b/src/runtime/internal/ResizeObserverSingleton.ts
@@ -7,40 +7,54 @@ const MapImplementation = "WeakMap" in window ? WeakMap : Map;
 export class ResizeObserverSingleton {
 	constructor(readonly options?: ResizeObserverOptions) {}
 
-	addListener(element: Element, callback: (element: Element)=>any) {
-		if (!this._callbacks.has(element)) {
-			this._callbacks.set(element, new Set([callback]));
+	addListener(element: Element, callback: Callback) {
+		if (!this._subscriptions.has(element)) {
+			this._subscriptions.set(element, new Subscription(new Set([callback])));
 			this._getObserver().observe(element, this.options);
 		} else {
-			this._callbacks.get(element)!.add(callback);
-			callback(element);
+			const subscription = this._subscriptions.get(element)!;
+			subscription.listeners.add(callback);
+			callback.call(element, subscription.lastEntry!);
 		}
 	}
 
-	removeListener(element: Element, callback: (element: Element)=>any) {
-		const list = this._callbacks.get(element);
-		if (!list) return;
-		if (list.size > 1) {
-			list.delete(callback);
+	removeListener(element: Element, callback: Callback) {
+		const subscription = this._subscriptions.get(element);
+		if (!subscription) return;
+		if (subscription.listeners.size > 1) {
+			subscription.listeners.delete(callback);
 		} else {
-			this._callbacks.delete(element);
+			this._subscriptions.delete(element);
 			this._getObserver().unobserve(element);
 		}
 	}
 
-	// TODO: consider using Array instead of Set?
-	// If we can guarantee one listener per element, we can simplify even more.
-	private readonly _callbacks: WeakMap<Element, Set<(element: Element)=>any>> = new MapImplementation();
+	getLastEntry(element: Element) {
+		return this._subscriptions.get(element)?.lastEntry;
+	}
+
+	private readonly _subscriptions: WeakMap<Element, Subscription> = new MapImplementation();
 	private _observer: ResizeObserver|undefined = undefined;
 	private _getObserver() {
 		return this._observer ?? (this._observer = new ResizeObserver((entries)=>{
 			for (const entry of entries) {
 				const element = entry.target;
-				const callbacks = this._callbacks.get(element);
-				if (callbacks) {
-					for (const callback of callbacks) callback(element);
-				}
+				const subscription = this._subscriptions.get(element);
+				if (!subscription) continue;
+				subscription.lastEntry = entry;
+				for (const callback of subscription.listeners) callback.call(element, entry);
 			}
 		}));
 	}
+}
+
+type Callback = (this: Element, entry: ResizeObserverEntry)=>any;
+
+class Subscription {
+	// TODO: consider using Array instead of Set?
+	// If we can guarantee one listener per element, we can simplify even more.
+	constructor(
+		readonly listeners: Set<Callback>,
+		public lastEntry?: ResizeObserverEntry,
+	) {}
 }
\ No newline at end of file
diff --git a/src/runtime/internal/dom.ts b/src/runtime/internal/dom.ts
index 02ae20b4d4..ed91330bbf 100644
--- a/src/runtime/internal/dom.ts
+++ b/src/runtime/internal/dom.ts
@@ -597,7 +597,7 @@ export function is_crossorigin() {
 	return crossorigin;
 }
 
-function add_iframe_resize_listener(node: HTMLElement, fn: () => void) {
+export function add_iframe_resize_listener(node: HTMLElement, fn: () => void) {
 	const computed_style = getComputedStyle(node);
 
 	if (computed_style.position === 'static') {
@@ -641,30 +641,41 @@ function add_iframe_resize_listener(node: HTMLElement, fn: () => void) {
 	};
 }
 
+const resize_observer_content_box = new ResizeObserverSingleton({ box: "content-box" });
+const resize_observer_border_box = new ResizeObserverSingleton({ box: "border-box" });
+const resize_observer_device_pixel_content_box = new ResizeObserverSingleton({ box: "device-pixel-content-box" });
 
-export const resize_observer_content_box = new ResizeObserverSingleton({ box: "content-box" });
-// export const resize_observer_border_box = new SoleResizeObserver({ box: "border-box" });
-// export const resize_observer_device_pixel_content_box = new SoleResizeObserver({ box: "device-pixel-content-box" });
-
-export function add_content_box_observer(node: HTMLElement, fn: () => void) {
+export function add_content_box_observer(node: Element, fn: () => void) {
 	resize_observer_content_box.addListener(node, fn);
 	return ()=> resize_observer_content_box.removeListener(node, fn);
 }
 
-// export function add_border_box_observer(node: HTMLElement, fn: () => void) {
-// 	resize_observer_border_box.addListener(node, fn);
-// 	return ()=> resize_observer_border_box.removeListener(node, fn);
-// }
-// 
-// export function add_device_pixel_content_box_observer(node: HTMLElement, fn: () => void) {
-// 	resize_observer_device_pixel_content_box.addListener(node, fn);
-// 	return ()=> resize_observer_device_pixel_content_box.removeListener(node, fn);
-// }
+export function add_border_box_observer(node: Element, fn: () => void) {
+	resize_observer_border_box.addListener(node, fn);
+	return ()=> resize_observer_border_box.removeListener(node, fn);
+}
+
+export function add_device_pixel_content_box_observer(node: Element, fn: () => void) {
+	resize_observer_device_pixel_content_box.addListener(node, fn);
+	return ()=> resize_observer_device_pixel_content_box.removeListener(node, fn);
+}
+
+export function get_content_rect(node: Element) {
+	return resize_observer_content_box.getLastEntry(node)!.contentRect;
+}
 
+export function get_content_box_size(node: Element) {
+	return resize_observer_content_box.getLastEntry(node)!.contentBoxSize;
+}
+
+export function get_border_box_size(node: Element) {
+	return resize_observer_border_box.getLastEntry(node)!.borderBoxSize;
+}
+
+export function get_device_pixel_content_box_size(node: Element) {
+	return resize_observer_device_pixel_content_box.getLastEntry(node)!.devicePixelContentBoxSize;
+}
 
-export const add_resize_listener = "ResizeObserver" in window ? 
-add_content_box_observer : 
-add_iframe_resize_listener;
 
 export function toggle_class(element, name, toggle) {
 	element.classList[toggle ? 'add' : 'remove'](name);