Changes from 2022-05-25 Working Draft diff --git a/css-view-transitions-2/Overview.bs b/css-view-transitions-2/Overview.bs index 8860f478754..8b0b03f0200 100644 --- a/css-view-transitions-2/Overview.bs +++ b/css-view-transitions-2/Overview.bs @@ -25,6 +25,8 @@ spec:css-view-transitions-1; text: skip the view transition; type: dfn; text: ViewTransition; type: interface; text: named elements; for: ViewTransition; type: dfn; + text: finished promise; for: ViewTransition; type: dfn; + text: ready promise; for: ViewTransition; type: dfn; text: update callback done promise; for: ViewTransition; type: dfn; text: initial snapshot containing block size; for: ViewTransition; type: dfn; text: captured elements; type: dfn; @@ -447,11 +449,22 @@ Note: as per default behavior, the ''@view-transition'' rule can be nested insid

The [=method steps=] for startViewTransition(|callbackOptions|) are as follows: - 1. If |callbackOptions| is not provided, then run the [=method steps=] for {{Document/startViewTransition()}} and return the result. - 1. Let |viewTransition| be null. - 1. If |callbackOptions| is an {{UpdateCallback}}, then set |viewTransition| to the result of running the [=method steps=] for {{Document/startViewTransition(updateCallback)}} given |callbackOptions|. + 1. If |this|'s [=active view transition=] is not null and its [=ViewTransition/is outbound cross-document transition=] is true, + then: + + 1. Let |transition| be a new {{ViewTransition}} in |this|'s [=relevant realm=]. + + 1. [=Resolve=] |transition|'s [=ViewTransition/finished promise=] with undefined. + + 1. [=Resolve=] |transition|'s [=ViewTransition/update callback done promise=] with undefined. + + 1. [=Reject=] |transition|'s [=ViewTransition/ready promise=] with an "{{InvalidStateError}}" {{DOMException}}. + + 1. If |callbackOptions| is not provided, then set |viewTransition| to the result of running the [=method steps=] for {{Document/startViewTransition()}}. + + 1. Otherwise, If |callbackOptions| is an {{UpdateCallback}}, then set |viewTransition| to the result of running the [=method steps=] for {{Document/startViewTransition(updateCallback)}} given |callbackOptions|. 1. Otherwise: @@ -459,19 +472,14 @@ Note: as per default behavior, the ''@view-transition'' rule can be nested insid 1. Set |viewTransition|'s [=ViewTransition/active types=] to |callbackOptions|'s {{StartViewTransitionOptions/type}}. - 1. If [=this=]'s [=auto-skip view transitions=] is true, - then [=skip the view transition|skip=] |viewTransition| with an "{{InvalidStateError}}" {{DOMException}}. - - Note: This would happen when starting a same-document view-transition on the old Document while a cross-document view-transition is being set up. - 1. Return |viewTransition|.

A {{Document}} additionaly has:

- : auto-skip view transitions - :: A boolean. Initially false. + : inbound view-transition steps + :: Null or an algorithm accepting nothing, initially null.

@@ -507,7 +515,7 @@ The {{CSSViewTransitionRule}} represents a ''@view-transition'' rule. A {{ViewTransition}} additionally has:

- : is inbound cross-document transition + : is outbound cross-document transition :: a boolean, initially false. : active types @@ -596,6 +604,8 @@ When capturing the old or new state for an element, perform the following steps To setup cross-document view-transition given a {{Document}} |oldDocument|, a {{Document}} |newDocument|, and |proceedWithNavigation|, which is an algorithm accepting nothing: + 1. [=Assert=]: These steps are running as part of a [=task=] queued on |oldDocument|. + 1. Let |resolvedRule| be the result of [=Resolve @view-transition rule|resolving the @view-transition rule=] for |oldDocument|. 1. If |resolvedRule| is "skip transition", then return null. @@ -610,44 +620,44 @@ When capturing the old or new state for an element, perform the following steps Note: this means that any running transition would be skipped when the document is ready to unload. - 1. Set |oldDocument|'s [=auto-skip view transitions=] to true. - - Note: this means that calling {{Document/startViewTransition()}} while capturing the old document for a cross-document view-transition would run the callback but skip the animation. - 1. Let |outboundTransition| be a new {{ViewTransition}} object in |oldDocument|'s [=relevant Realm=], whose [=ViewTransition/active types=] is |resolvedRule|. - 1. Run the following steps when [=Perform pending transition operations|performing pending transition operations=]: + 1. Set |outboundTransition|'s [=is outbound cross-document transition=] to true. - 1. If |outboundTransition|'s [=ViewTransition/phase=] is "`done`", then call |proceedWithNavigation| and return. + 1. Run the following steps when [=Perform pending transition operations|performing pending transition operations=]: 1. Assert: |outboundTransition|'s [=ViewTransition/phase=] is "`pending-capture`". - 1. Set |oldDocument|'s [=auto-skip view transitions=] to false. - 1. [=Capture the old state=] for |outboundTransition|. - 1. If failure is returned, call |proceedWithNavigation| and return. + 1. If this succeeded, then: + + 1. Let |clonedNamedElements| be |outboundTransition|'s [=ViewTransition/named elements=] to a [=map/clone=] of |outboundTransition|'s [=ViewTransition/named elements=]. + + 1. Let |initialSnapshotContainingBlockSize| to |outboundTransition|'s [=ViewTransition/initial snapshot containing block size=]. + + 1. Set |newDocument|'s [=inbound view-transition steps=] to the following steps: + + 1. [=Assert=]: |newDocument| is [=fully active=]. - 1. [=Queue a global task=] on the [=DOM manipulation task source=] given |newDocument|'s [=relevant global object=], - to perform the following steps: + 1. Let |inboundTransition| be a new {{ViewTransition}} in |newDocument|'s [=relevant Realm=], + whose [=ViewTransition/named elements=] is |clonedNamedElements|, + and [=ViewTransition/initial snapshot containing block size=] is |initialSnapshotContainingBlockSize|. - 1. Let |inboundTransition| be a new {{ViewTransition}} in |newDocument|'s [=relevant Realm=], - whose [=ViewTransition/named elements=] is |outboundTransition|'s [=ViewTransition/named elements=], - [=ViewTransition/initial snapshot containing block size=] is |outboundTransition|'s [=ViewTransition/initial snapshot containing block size=], - and whose [=ViewTransition/is inbound cross-document transition=] is true. + 1. Set |newDocument|'s [=active view transition=] to |inboundTransition|. - 1. Set |newDocument|'s [=active view transition=] to |inboundTransition|. + 1. [=Resolve=] |inboundTransition|’s [=ViewTransition/update callback done promise=] with undefined. - 1. [=Resolve=] |inboundTransition|’s [=ViewTransition/update callback done promise=] with undefined. + 1. Set |inboundTransition|’s [=ViewTransition/phase=] to "`update-callback-called`". - 1. Set |inboundTransition|’s [=ViewTransition/phase=] to "`update-callback-called`". + 1. At any given time, the UA may decide to skip |inboundTransition|, e.g. after an [=implementation-defined=] timeout. + To do so, the UA should [=queue a global task=] on the [=DOM manipulation task source=] given |newDocument|'s [=relevant global object=] to perform the following step: + If |transition|'s [=ViewTransition/phase=] is not "`done`", then [=skip the view transition=] |transition| with a "{{TimeoutError}}" {{DOMException}}. - 1. At any given time, the UA may decide to skip |inboundTransition|, e.g. after an [=implementation-defined=] timeout. - To do so, the UA should [=queue a global task=] on the [=DOM manipulation task source=] given |newDocument|'s [=relevant global object=] to perform the following step: - If |transition|'s [=ViewTransition/phase=] is not "`done`", then [=skip the view transition=] |transition| with a "{{TimeoutError}}" {{DOMException}}. + 1. Return |inboundTransition|. - Note: The |inboundTransition| is activated after the dispatch of {{Window/pagereveal}} to ensure mutations made in this event apply to the captured new state. + Note: The |inboundTransition| is activated after the dispatch of {{Window/pagereveal}} to ensure mutations made in this event apply to the captured new state. 1. [=Clear view transition=] |outboundTransition|. @@ -674,13 +684,11 @@ When capturing the old or new state for an element, perform the following steps

To resolve cross-document view-transition for {{Document}} |document|: - 1. Let |transition| be |document|'s [=active view transition=]. + 1. If |document|'s [=inbound view-transition steps=] is null, then return. - 1. If |transition| is null or |transition|'s [=ViewTransition/is inbound cross-document transition=] is false, - then return null. + 1. Let |transition| be the result of running |document|'s [=inbound view-transition steps=]. - Note: |transition|'s [=ViewTransition/is inbound cross-document transition=] would be false if a same-document - transition was started before the {{Window/pagereveal}} event was fired. + 1. If |transition| is null then return null. 1. [=Resolve @view-transition rule=] for |document| and let |resolvedRule| be the result. From 34925bbcec60099d0a28c02e072f16fbc489da6a Mon Sep 17 00:00:00 2001 From: Noam Rosenthal Date: Thu, 8 Feb 2024 14:14:09 +0000 Subject: [PATCH 06/13] Add missing piece --- css-view-transitions-2/Overview.bs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/css-view-transitions-2/Overview.bs b/css-view-transitions-2/Overview.bs index 8b0b03f0200..ac7bbf8436f 100644 --- a/css-view-transitions-2/Overview.bs +++ b/css-view-transitions-2/Overview.bs @@ -478,7 +478,7 @@ Note: as per default behavior, the ''@view-transition'' rule can be nested insid A {{Document}} additionaly has:

- : inbound view-transition steps + : inbound view transition steps :: Null or an algorithm accepting nothing, initially null.

@@ -637,10 +637,16 @@ When capturing the old or new state for an element, perform the following steps 1. Let |initialSnapshotContainingBlockSize| to |outboundTransition|'s [=ViewTransition/initial snapshot containing block size=]. - 1. Set |newDocument|'s [=inbound view-transition steps=] to the following steps: + 1. Set |newDocument|'s [=inbound view transition steps=] to the following steps: 1. [=Assert=]: |newDocument| is [=fully active=]. + 1. Set |newDocument|'s [=inbound view transition steps=] to null. + + 1. If |newDocument|'s [=active view transition=] is not null, then return. + + Note: this means that starting a same-document transition before revealing the document would cancel a pending cross-document transition. + 1. Let |inboundTransition| be a new {{ViewTransition}} in |newDocument|'s [=relevant Realm=], whose [=ViewTransition/named elements=] is |clonedNamedElements|, and [=ViewTransition/initial snapshot containing block size=] is |initialSnapshotContainingBlockSize|. @@ -684,9 +690,9 @@ When capturing the old or new state for an element, perform the following steps

To resolve cross-document view-transition for {{Document}} |document|: - 1. If |document|'s [=inbound view-transition steps=] is null, then return. + 1. If |document|'s [=inbound view transition steps=] is null, then return. - 1. Let |transition| be the result of running |document|'s [=inbound view-transition steps=]. + 1. Let |transition| be the result of running |document|'s [=inbound view transition steps=]. 1. If |transition| is null then return null. From 4193a7879cf7b2312c24cca777fb09022bb4e09a Mon Sep 17 00:00:00 2001 From: Noam Rosenthal Date: Fri, 9 Feb 2024 10:26:07 +0000 Subject: [PATCH 07/13] Remove more references to L2 --- css-view-transitions-1/Overview.bs | 4 - css-view-transitions-2/Overview.bs | 152 ++++++++++++++--------------- 2 files changed, 76 insertions(+), 80 deletions(-) diff --git a/css-view-transitions-1/Overview.bs b/css-view-transitions-1/Overview.bs index 444de40ec43..bf91a9b05cd 100644 --- a/css-view-transitions-1/Overview.bs +++ b/css-view-transitions-1/Overview.bs @@ -1100,8 +1100,6 @@ urlPrefix: https://wicg.github.io/navigation-api/; type: interface; [Discussion of this behavior](https://github.com/w3c/csswg-drafts/issues/8045).

- A {{ViewTransition}} must never have both an [=ViewTransition/update callback=] and a [=ViewTransition/process old state captured=]. - The {{ViewTransition/finished}} [=getter steps=] are to return [=this's=] [=ViewTransition/finished promise=]. The {{ViewTransition/ready}} [=getter steps=] are to return [=this's=] [=ViewTransition/ready promise=]. @@ -1669,8 +1667,6 @@ urlPrefix: https://wicg.github.io/navigation-api/; type: interface; Note: Since the rejection of |transition|'s [=ViewTransition/update callback done promise=] isn't explicitly handled here, if |transition|'s [=ViewTransition/update callback done promise=] rejects, then |transition|'s [=ViewTransition/finished promise=] will reject with the same reason. - - 1. If |transition|'s [=ViewTransition/process old state captured=] is not null, then call |transition|'s [=ViewTransition/process old state captured=]. ## [=Capture the image=] ## {#capture-the-image-algorithm} diff --git a/css-view-transitions-2/Overview.bs b/css-view-transitions-2/Overview.bs index ac7bbf8436f..d4b02c793cd 100644 --- a/css-view-transitions-2/Overview.bs +++ b/css-view-transitions-2/Overview.bs @@ -449,41 +449,28 @@ Note: as per default behavior, the ''@view-transition'' rule can be nested insid

The [=method steps=] for startViewTransition(|callbackOptions|) are as follows: - 1. Let |viewTransition| be null. - - 1. If |this|'s [=active view transition=] is not null and its [=ViewTransition/is outbound cross-document transition=] is true, + 1. If |this|'s [=active view transition=] is not null and its [=outbound post-capture steps=] is not null, then: - 1. Let |transition| be a new {{ViewTransition}} in |this|'s [=relevant realm=]. - - 1. [=Resolve=] |transition|'s [=ViewTransition/finished promise=] with undefined. + 1. Let |preSkippedTransition| be a new {{ViewTransition}} in |this|'s [=relevant realm=]. - 1. [=Resolve=] |transition|'s [=ViewTransition/update callback done promise=] with undefined. + 1. [=Skip the view transition|Skip=] |preSkippedTransition| with an "{{InvalidStateError}}" {{DOMException}}. - 1. [=Reject=] |transition|'s [=ViewTransition/ready promise=] with an "{{InvalidStateError}}" {{DOMException}}. + 1. Return |preSkippedTransition|. - 1. If |callbackOptions| is not provided, then set |viewTransition| to the result of running the [=method steps=] for {{Document/startViewTransition()}}. + 1. If |callbackOptions| is not provided, then return the result of running the [=method steps=] for {{Document/startViewTransition()}}. - 1. Otherwise, If |callbackOptions| is an {{UpdateCallback}}, then set |viewTransition| to the result of running the [=method steps=] for {{Document/startViewTransition(updateCallback)}} given |callbackOptions|. + 1. Otherwise, if |callbackOptions| is an {{UpdateCallback}}, then return the result of running the [=method steps=] for {{Document/startViewTransition(updateCallback)}} given |callbackOptions|. 1. Otherwise: - 1. Set |viewTransition| to the result of running [=method steps=] for {{Document/startViewTransition(updateCallback)}} given |callbackOptions|'s {{StartViewTransitionOptions/update}}. + 1. Let |viewTransition| be the result of running [=method steps=] for {{Document/startViewTransition(updateCallback)}} given |callbackOptions|'s {{StartViewTransitionOptions/update}}. 1. Set |viewTransition|'s [=ViewTransition/active types=] to |callbackOptions|'s {{StartViewTransitionOptions/type}}. - 1. Return |viewTransition|. + 1. Return |viewTransition|.

- A {{Document}} additionaly has: - -

- : inbound view transition steps - :: Null or an algorithm accepting nothing, initially null. -

- - - ## Extensions to the CSSRule interface

+ : inbound named elements + :: Null or [=/map=] with the same type as [=ViewTransition/named elements=]. + Initially null. + + : inbound snapshot containing block size + :: a [=tuple=] of two numbers (width and height), or null. + Initially null. +

- : is outbound cross-document transition - :: a boolean, initially false. + : outbound post-capture steps + :: Null or a set of steps, initially null. : active types :: Null or a [=list=] of strings, initially null. @@ -531,7 +531,7 @@ The [=captured element=] struct should contain these fields, in addition to the :: a [=/list=] of strings, initially empty.