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

Omits readonly attributes from SSR code #2877

Merged
Merged
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
22 changes: 22 additions & 0 deletions src/compile/nodes/Binding.ts
Original file line number Diff line number Diff line change
@@ -3,6 +3,15 @@ import get_object from '../utils/get_object';
import Expression from './shared/Expression';
import Component from '../Component';
import TemplateScope from './shared/TemplateScope';
import {dimensions} from "../../utils/patterns";

// TODO this should live in a specific binding
const read_only_media_attributes = new Set([
'duration',
'buffered',
'seekable',
'played'
]);

export default class Binding extends Node {
type: 'Binding';
@@ -11,6 +20,7 @@ export default class Binding extends Node {
is_contextual: boolean;
obj: string;
prop: string;
is_readonly: boolean;

constructor(component: Component, parent, scope: TemplateScope, info) {
super(component, parent, scope, info);
@@ -64,5 +74,17 @@ export default class Binding extends Node {

this.obj = obj;
this.prop = prop;

const type = parent.get_static_attribute_value('type');

this.is_readonly = (
dimensions.test(this.name) ||
(parent.is_media_node && parent.is_media_node() && read_only_media_attributes.has(this.name)) ||
(parent.name === 'input' && type === 'file') // TODO others?
);
}

is_readonly_media_attribute() {
return read_only_media_attributes.has(this.name);
}
}
2 changes: 1 addition & 1 deletion src/compile/nodes/shared/Node.ts
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ export default class Node {
}

get_static_attribute_value(name: string) {
const attribute = this.attributes.find(
const attribute = this.attributes && this.attributes.find(
(attr: Attribute) => attr.type === 'Attribute' && attr.name.toLowerCase() === name
);

18 changes: 2 additions & 16 deletions src/compile/render-dom/wrappers/Element/Binding.ts
Original file line number Diff line number Diff line change
@@ -9,14 +9,6 @@ import flatten_reference from '../../../utils/flatten_reference';
import EachBlock from '../../../nodes/EachBlock';
import { Node as INode } from '../../../../interfaces';

// TODO this should live in a specific binding
const read_only_media_attributes = new Set([
'duration',
'buffered',
'seekable',
'played'
]);

function get_tail(node: INode) {
const end = node.end;
while (node.type === 'MemberExpression') node = node.object;
@@ -74,13 +66,7 @@ export default class BindingWrapper {

this.snippet = this.node.expression.render(block);

const type = parent.node.get_static_attribute_value('type');

this.is_readonly = (
dimensions.test(this.node.name) ||
(parent.node.is_media_node() && read_only_media_attributes.has(this.node.name)) ||
(parent.node.name === 'input' && type === 'file') // TODO others?
);
this.is_readonly = this.node.is_readonly;

this.needs_lock = this.node.name === 'currentTime'; // TODO others?
}
@@ -101,7 +87,7 @@ export default class BindingWrapper {
}

is_readonly_media_attribute() {
return read_only_media_attributes.has(this.node.name);
return this.node.is_readonly_media_attribute()
}

render(block: Block, lock: string) {
4 changes: 4 additions & 0 deletions src/compile/render-ssr/handlers/Element.ts
Original file line number Diff line number Diff line change
@@ -140,6 +140,10 @@ export default function(node: Element, renderer: Renderer, options: RenderOption
node.bindings.forEach(binding => {
const { name, expression } = binding;

if (binding.is_readonly) {
return;
}

if (name === 'group') {
// TODO server-render group bindings
} else {
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<div></div>
<audio></audio>
<video></video>
<input type="file">
44 changes: 44 additions & 0 deletions test/server-side-rendering/samples/bindings-readonly/main.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<script>
export let clientWidth = 1;
export let clientHeight = 2;
export let offsetHeight = 3;
export let offsetWidth = 4;

export let audioDuration = 5;
export let audioBuffered = 6;
export let audioSeekable = 7;
export let audioPlayed = 8;

export let videoDuration = 9;
export let videoBuffered = 10;
export let videoSeekable = 11;
export let videoPlayed = 12;

export let value = '/some/file';
</script>

<div
bind:clientWidth
bind:clientHeight
bind:offsetWidth
bind:offsetHeight
></div>

<audio
bind:duration="{audioDuration}"
bind:buffered="{audioBuffered}"
bind:seekable="{audioSeekable}"
bind:played="{audioPlayed}"
></audio>

<video
bind:duration="{videoDuration}"
bind:buffered="{videoBuffered}"
bind:seekable="{videoSeekable}"
bind:played="{videoPlayed}"
></video>

<input
type="file"
bind:value
/>