This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Commit dd8bb13

committed

Fix parseTransition bug

1 parent 6d9e4e5 commit dd8bb13Copy full SHA for dd8bb13

File tree

-2

lines changed

-2

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,13 @@ describe("parseTransition", () => {`
`19`	`19`	`{ property: "height", duration: 3000, delay: 2000 },`
`20`	`20`	`],`
`21`	`21`	`],`
	`22`	`+ [`
	`23`	`+ "transform 100ms cubic-bezier(0.4, 0.0, 0.6, 1) 150ms",`
	`24`	`+ [`
	`25`	`+ { property: "transform", duration: 100, delay: 150 },`
	`26`	`+ { property: "transform", duration: 100, delay: 150 },`
	`27`	`+ ],`
	`28`	`+ ],`
`22`	`29`	`];`
`23`	`30`	`cases.forEach((c) => assert.deepEqual(parseTransition(c[0] as string), c[1]));`
`24`	`31`	`});`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ export function parseTransition(transition: string): [TransitionEntry, Transitio`
`11`	`11`	`let firstProperty: TransitionEntry = null;`
`12`	`12`	`let lastPropertyTotalDuration = -1;`
`13`	`13`	`let firstPropertyDelay = 99999999;`
`14`		`- transition.split(/\s,\s/).forEach(`
	`14`	`+ transition.split(/\s,\s(?![^$]*$)/g).forEach(`
`15`	`15`	`(entry) => {`
`16`		`- const parts = entry.split(/\s+/);`
	`16`	`+ const parts = entry.split(/\s+(?![^$]*$)/g);`
`17`	`17`	`const property = parts.filter((p) => p.match(/^[a-z\-A-Z]+$/))[0];`
`18`	`18`	`const [duration = 0, delay = 0] = parts.filter((p) => p.match(/^[0-9]+m?s$/)).map((p) => parseDuration(p));`
`19`	`19`	`const totalDuration = duration + delay;`

Comments

(0)