Merge pull request #1 from sveltejs/zxbodya-ts-resolved

Resolve merge conflicts
pull/2842/head
Bogdan Savluk 5 years ago committed by GitHub
commit 821133f8f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -30,10 +30,7 @@
$: selected = filteredPeople[i];
$: {
first = selected ? selected.first : '';
last = selected ? selected.last : '';
}
$: reset_inputs(selected);
function create() {
people = people.concat({ first, last });
@ -53,7 +50,8 @@
}
function reset_inputs(person) {
({ first, last } = person);
first = person ? person.first : '';
last = person ? person.last : '';
}
</script>

@ -27,7 +27,7 @@ import { pannable } from './pannable.js';
></div>
```
Open the `pannable.js` file. Like transition functions, an action function receives a `node` and some optional parameters, and returns an action object. That object must have a `destroy` function, which is called when the element is unmounted.
Open the `pannable.js` file. Like transition functions, an action function receives a `node` and some optional parameters, and returns an action object. That object can have a `destroy` function, which is called when the element is unmounted.
We want to fire `panstart` event when the user mouses down on the element, `panmove` events (with `dx` and `dy` properties showing how far the mouse moved) when they drag it, and `panend` events when they mouse up. One possible implementation looks like this:
@ -84,4 +84,3 @@ export function pannable(node) {
Update the `pannable` function and try moving the box around.
> This implementation is for demonstration purposes — a more complete one would also consider touch events.

@ -0,0 +1,4 @@
export function get(req, res) {
res.writeHead(302, { Location: 'https://github.com/sveltejs/svelte/wiki/FAQ' });
res.end();
}

@ -548,7 +548,7 @@ export default class Element extends Node {
message: `'group' binding can only be used with <input type="checkbox"> or <input type="radio">`
});
}
} else if (name == 'files') {
} else if (name === 'files') {
if (this.name !== 'input') {
component.error(binding, {
code: `invalid-binding`,
@ -564,6 +564,14 @@ export default class Element extends Node {
message: `'files' binding can only be used with <input type="file">`
});
}
} else if (name === 'open') {
if (this.name !== 'details') {
component.error(binding, {
code: `invalid-binding`,
message: `'${name}' binding can only be used with <details>`
});
}
} else if (
name === 'currentTime' ||
name === 'duration' ||

@ -134,7 +134,6 @@ export default function dom(
});
if (component.compile_options.dev) {
// TODO check no uunexpected props were passed, as well as
// checking that expected ones were passed
const expected = props.filter(prop => !prop.initialised);
@ -395,6 +394,16 @@ export default function dom(
return $name;
});
let unknown_props_check;
if (component.compile_options.dev && writable_props.length) {
unknown_props_check = deindent`
const writable_props = [${writable_props.map(prop => `'${prop.export_name}'`).join(', ')}];
Object.keys($$props).forEach(key => {
if (!writable_props.includes(key)) console.warn(\`<${component.tag}> was created with unknown prop '\${key}'\`);
});
`;
}
builder.add_block(deindent`
function ${definition}(${args.join(', ')}) {
${reactive_store_declarations.length > 0 && `let ${reactive_store_declarations.join(', ')};`}
@ -405,6 +414,8 @@ export default function dom(
${component.javascript}
${unknown_props_check}
${component.slots.size && `let { $$slots = {}, $$scope } = $$props;`}
${renderer.binding_groups.length > 0 && `const $$binding_groups = [${renderer.binding_groups.map(_ => `[]`).join(', ')}];`}

@ -90,6 +90,12 @@ const events = [
name === 'playbackRate'
},
// details event
{
event_names: ['toggle'],
filter: (node: Element, name: string) =>
node.name === 'details'
},
];
export default class ElementWrapper extends Wrapper {
@ -455,7 +461,7 @@ export default class ElementWrapper extends Wrapper {
function ${handler}() {
${animation_frame && deindent`
cancelAnimationFrame(${animation_frame});
if (!${this.var}.paused) ${animation_frame} = requestAnimationFrame(${handler});`}
if (!${this.var}.paused) ${animation_frame} = @raf(${handler});`}
${needs_lock && `${lock} = true;`}
ctx.${handler}.call(${this.var}${contextual_dependencies.size > 0 ? ', ctx' : ''});
}

@ -1,4 +1,4 @@
import { now } from './utils';
import { now, raf } from './utils';
export interface Task { abort(): void; promise: Promise<undefined> }
@ -14,7 +14,7 @@ function run_tasks() {
});
running = tasks.size > 0;
if (running) requestAnimationFrame(run_tasks);
if (running) raf(run_tasks);
}
export function clear_loops() {
@ -28,7 +28,7 @@ export function loop(fn: (number)=>void): Task {
if (!running) {
running = true;
requestAnimationFrame(run_tasks);
raf(run_tasks);
}
return {

@ -1,4 +1,5 @@
import { element } from './dom';
import { raf } from './utils';
let stylesheet;
let active = 0;
@ -56,7 +57,7 @@ export function delete_rule(node, name?) {
}
export function clear_rules() {
requestAnimationFrame(() => {
raf(() => {
if (active) return;
let i = stylesheet.cssRules.length;
while (i--) stylesheet.deleteRule(i);

@ -80,11 +80,19 @@ export function exclude_internal_props(props) {
return result;
}
export let now: () => number = typeof window !== 'undefined'
const is_client = typeof window !== 'undefined';
export let now: () => number = is_client
? () => window.performance.now()
: () => Date.now();
export let raf = is_client ? requestAnimationFrame : noop;
// used internally for testing
export function set_now(fn) {
now = fn;
}
export function set_raf(fn) {
raf = fn;
}

@ -0,0 +1,69 @@
/* generated by Svelte vX.Y.Z */
import {
SvelteComponent,
detach,
element,
init,
insert,
listen,
noop,
safe_not_equal
} from "svelte/internal";
function create_fragment(ctx) {
var details, dispose;
return {
c() {
details = element("details");
details.innerHTML = `<summary>summary</summary>content
`;
dispose = listen(details, "toggle", ctx.details_toggle_handler);
},
m(target, anchor) {
insert(target, details, anchor);
details.open = ctx.open;
},
p(changed, ctx) {
if (changed.open) details.open = ctx.open;
},
i: noop,
o: noop,
d(detaching) {
if (detaching) {
detach(details);
}
dispose();
}
};
}
function instance($$self, $$props, $$invalidate) {
let { open } = $$props;
function details_toggle_handler() {
open = this.open;
$$invalidate('open', open);
}
$$self.$set = $$props => {
if ('open' in $$props) $$invalidate('open', open = $$props.open);
};
return { open, details_toggle_handler };
}
class Component extends SvelteComponent {
constructor(options) {
super();
init(this, options, instance, create_fragment, safe_not_equal, ["open"]);
}
}
export default Component;

@ -0,0 +1,7 @@
<script>
export let open;
</script>
<details bind:open={open}>
<summary>summary</summary>content
</details>

@ -65,6 +65,11 @@ function create_fragment(ctx) {
function instance($$self, $$props, $$invalidate) {
let { name } = $$props;
const writable_props = ['name'];
Object.keys($$props).forEach(key => {
if (!writable_props.includes(key)) console.warn(`<Component> was created with unknown prop '${key}'`);
});
$$self.$set = $$props => {
if ('name' in $$props) $$invalidate('name', name = $$props.name);
};

@ -151,6 +151,11 @@ function create_fragment(ctx) {
function instance($$self, $$props, $$invalidate) {
let { things, foo, bar, baz } = $$props;
const writable_props = ['things', 'foo', 'bar', 'baz'];
Object.keys($$props).forEach(key => {
if (!writable_props.includes(key)) console.warn(`<Component> was created with unknown prop '${key}'`);
});
$$self.$set = $$props => {
if ('things' in $$props) $$invalidate('things', things = $$props.things);
if ('foo' in $$props) $$invalidate('foo', foo = $$props.foo);

@ -151,6 +151,11 @@ function create_fragment(ctx) {
function instance($$self, $$props, $$invalidate) {
let { things, foo } = $$props;
const writable_props = ['things', 'foo'];
Object.keys($$props).forEach(key => {
if (!writable_props.includes(key)) console.warn(`<Component> was created with unknown prop '${key}'`);
});
$$self.$set = $$props => {
if ('things' in $$props) $$invalidate('things', things = $$props.things);
if ('foo' in $$props) $$invalidate('foo', foo = $$props.foo);

@ -53,4 +53,4 @@ class Component extends SvelteComponentDev {
}
}
export default Component;
export default Component;

@ -65,6 +65,11 @@ function instance($$self, $$props, $$invalidate) {
let bar;
const writable_props = ['foo'];
Object.keys($$props).forEach(key => {
if (!writable_props.includes(key)) console.warn(`<Component> was created with unknown prop '${key}'`);
});
$$self.$set = $$props => {
if ('foo' in $$props) $$invalidate('foo', foo = $$props.foo);
};

@ -8,6 +8,7 @@ import {
insert,
listen,
noop,
raf,
run_all,
safe_not_equal,
time_ranges_to_array
@ -18,7 +19,7 @@ function create_fragment(ctx) {
function audio_timeupdate_handler() {
cancelAnimationFrame(audio_animationframe);
if (!audio.paused) audio_animationframe = requestAnimationFrame(audio_timeupdate_handler);
if (!audio.paused) audio_animationframe = raf(audio_timeupdate_handler);
audio_updating = true;
ctx.audio_timeupdate_handler.call(audio);
}

@ -3,7 +3,7 @@ import * as path from "path";
import * as fs from "fs";
import { rollup } from 'rollup';
import * as virtual from 'rollup-plugin-virtual';
import { clear_loops, set_now } from "../../internal.js";
import { clear_loops, set_now, set_raf } from "../../internal.js";
import {
showOutput,
@ -101,7 +101,7 @@ describe("runtime", () => {
}
};
set_now(() => raf.time);
global.requestAnimationFrame = cb => {
set_raf(cb => {
let called = false;
raf.callback = () => {
if (!called) {
@ -109,7 +109,7 @@ describe("runtime", () => {
cb();
}
};
};
});
try {
mod = require(`./samples/${dir}/main.svelte`);

@ -0,0 +1,25 @@
export default {
html: `
<details><summary>toggle</summary></details>
`,
async test({ assert, component, target, window }) {
const details = target.querySelector('details');
const event = new window.Event('toggle');
details.open = true;
await details.dispatchEvent(event);
assert.equal(component.visible, true);
assert.htmlEqual(target.innerHTML, `
<details open><summary>toggle</summary></details>
<p>hello!</p>
`);
details.open = false;
await details.dispatchEvent(event);
assert.equal(component.visible, false);
assert.htmlEqual(target.innerHTML, `
<details><summary>toggle</summary></details>
`);
}
};

@ -0,0 +1,9 @@
<script>
export let visible;
</script>
<details bind:open={visible}><summary>toggle</summary></details>
{#if visible}
<p>hello!</p>
{/if}

@ -0,0 +1,5 @@
<script>
export let foo = undefined;
</script>
<div>{foo}</div>

@ -0,0 +1,9 @@
export default {
compileOptions: {
dev: true
},
warnings: [
`<Foo> was created with unknown prop 'fo'`
]
};

@ -0,0 +1,5 @@
<script>
import Foo from './Foo.svelte';
</script>
<Foo fo="sho"/>
Loading…
Cancel
Save