Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: apply inert to outroing elements #8628

Merged
merged 1 commit into from
May 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* **breaking** Error on falsy values instead of stores passed to `derived` ([#7947](https://github.com/sveltejs/svelte/pull/7947))
* **breaking** Custom store implementers now need to pass an `update` function additionally to the `set` function ([#6750](https://github.com/sveltejs/svelte/pull/6750))
* **breaking** Change order in which preprocessors are applied ([#8618](https://github.com/sveltejs/svelte/pull/8618))
* **breaking** apply `inert` to outroing elements ([#8627](https://github.com/sveltejs/svelte/pull/8627))
* Add a way to modify attributes for script/style preprocessors ([#8618](https://github.com/sveltejs/svelte/pull/8618))
* Improve hydration speed by adding `data-svelte-h` attribute to detect unchanged HTML elements ([#7426](https://github.com/sveltejs/svelte/pull/7426))
* Add `a11y no-noninteractive-element-interactions` rule ([#8391](https://github.com/sveltejs/svelte/pull/8391))
Expand Down
35 changes: 33 additions & 2 deletions src/runtime/internal/transitions.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,15 @@ export function create_in_transition(node, fn, params) {
* @returns {{ end(reset: any): void; }}
*/
export function create_out_transition(node, fn, params) {
/**
* @type {TransitionOptions} */
/** @type {TransitionOptions} */
const options = { direction: 'out' };
let config = fn(node, params, options);
let running = true;
let animation_name;
const group = outros;
group.r += 1;
/** @type {boolean} */
let original_inert_value;

/**
* @returns {void} */
Expand All @@ -205,10 +206,18 @@ export function create_out_transition(node, fn, params) {
tick = noop,
css
} = config || null_transition;

if (css) animation_name = create_rule(node, 1, 0, duration, delay, easing, css);

const start_time = now() + delay;
const end_time = start_time + duration;
add_render_callback(() => dispatch(node, false, 'start'));

if ('inert' in node) {
original_inert_value = /** @type {HTMLElement} */ (node).inert;
node.inert = true;
}

loop((now) => {
if (running) {
if (now >= end_time) {
Expand All @@ -229,6 +238,7 @@ export function create_out_transition(node, fn, params) {
return running;
});
}

if (is_function(config)) {
wait().then(() => {
// @ts-ignore
Expand All @@ -238,8 +248,12 @@ export function create_out_transition(node, fn, params) {
} else {
go();
}

return {
end(reset) {
if (reset && 'inert' in node) {
node.inert = original_inert_value;
}
if (reset && config.tick) {
config.tick(1, 0);
}
Expand Down Expand Up @@ -274,6 +288,9 @@ export function create_bidirectional_transition(node, fn, params, intro) {
let pending_program = null;
let animation_name = null;

/** @type {boolean} */
let original_inert_value;

/**
* @returns {void} */
function clear_animation() {
Expand Down Expand Up @@ -318,11 +335,25 @@ export function create_bidirectional_transition(node, fn, params, intro) {
start: now() + delay,
b
};

if (!b) {
// @ts-ignore todo: improve typings
program.group = outros;
outros.r += 1;
}

if ('inert' in node) {
if (b) {
if (original_inert_value !== undefined) {
// aborted/reversed outro — restore previous inert value
node.inert = original_inert_value;
}
} else {
original_inert_value = /** @type {HTMLElement} */ (node).inert;
node.inert = true;
}
}

if (running_program || pending_program) {
pending_program = program;
} else {
Expand Down
28 changes: 28 additions & 0 deletions test/runtime/samples/transition-inert/_config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
export default {
async test({ assert, component, target, raf }) {
// jsdom doesn't set the inert attribute, and the transition checks if it exists, so set it manually to trigger the inert logic
target.querySelector('button.a').inert = false;
target.querySelector('button.b').inert = false;

// check and abort halfway through the outro transition
component.visible = false;
raf.tick(50);
assert.strictEqual(target.querySelector('button.a').inert, true);
assert.strictEqual(target.querySelector('button.b').inert, true);

component.visible = true;
assert.strictEqual(target.querySelector('button.a').inert, false);
assert.strictEqual(target.querySelector('button.b').inert, false);

// let it transition out completely and then back in
component.visible = false;
raf.tick(101);
component.visible = true;
raf.tick(50);
assert.strictEqual(target.querySelector('button.a').inert, false);
assert.strictEqual(target.querySelector('button.b').inert, false);
raf.tick(51);
assert.strictEqual(target.querySelector('button.a').inert, false);
assert.strictEqual(target.querySelector('button.b').inert, false);
}
};
16 changes: 16 additions & 0 deletions test/runtime/samples/transition-inert/main.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<script>
export let visible = true;

function slide(_, params) {
return params;
}
</script>

{#if visible}
<button class="a" transition:slide={{ duration: 100 }}>
foo
</button>
<button class="b" out:slide={{ duration: 100 }}>
bar
</button>
{/if}