Skip to content

Commit 2adb182

Browse files
krausestkrausest
committed
Merge branch 'iminside-master'
2 parents a8579cf + e7f1546 commit 2adb182

File tree

12 files changed

+371
-503
lines changed

12 files changed

+371
-503
lines changed

‎frameworks/keyed/fractal/.babelrc‎ renamed to ‎frameworks/keyed/whatsup/.babelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@
1010
],
1111
"@babel/typescript"
1212
],
13-
"plugins": ["@babel/transform-typescript", "@babel/proposal-class-properties", "@fract/transform-jsx"]
13+
"plugins": ["@babel/transform-typescript", "@babel/proposal-class-properties", "@whatsup/transform-jsx"]
1414
}

‎frameworks/keyed/fractal/.gitignore‎ renamed to ‎frameworks/keyed/whatsup/.gitignore‎

File renamed without changes.

‎frameworks/keyed/fractal/.prettierrc‎ renamed to ‎frameworks/keyed/whatsup/.prettierrc‎

File renamed without changes.

‎frameworks/keyed/fractal/index.html‎ renamed to ‎frameworks/keyed/whatsup/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<title>fractal</title>
5+
<title>WhatsUp</title>
66
<link href="/css/currentStyle.css" rel="stylesheet" />
77
</head>
88
<body>

‎frameworks/keyed/fractal/package-lock.json‎ renamed to ‎frameworks/keyed/whatsup/package-lock.json‎

Lines changed: 297 additions & 443 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frameworks/keyed/fractal/package.json‎ renamed to ‎frameworks/keyed/whatsup/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"name": "js-framework-benchmark-fractal",
2+
"name": "js-framework-benchmark-whatsup",
33
"version": "1.0.0",
4-
"description": "Benchmark for Fractal framework",
4+
"description": "Benchmark for WhatsUp framework",
55
"author": "Denis Churbanov",
66
"license": "MIT",
77
"js-framework-benchmark": {
8-
"frameworkVersionFromPackage": "@fract/core"
8+
"frameworkVersionFromPackage": "whatsup"
99
},
1010
"repository": {
1111
"type": "git",
@@ -16,8 +16,8 @@
1616
"build-prod": "webpack -p"
1717
},
1818
"dependencies": {
19-
"@fract/core": "0.2.1",
20-
"@fract/jsx": "0.2.0"
19+
"whatsup": "1.1.1",
20+
"@whatsup/jsx": "0.1.4"
2121
},
2222
"devDependencies": {
2323
"@babel/cli": "7.10.4",
@@ -27,7 +27,7 @@
2727
"@babel/plugin-transform-typescript": "7.10.4",
2828
"@babel/preset-env": "7.10.4",
2929
"@babel/preset-typescript": "7.10.4",
30-
"@fract/babel-plugin-transform-jsx": "0.2.1",
30+
"@whatsup/babel-plugin-transform-jsx": "0.2.2",
3131
"babel-loader": "8.1.0",
3232
"core-js": "3.6.5",
3333
"prettier": "2.0.5",

‎frameworks/keyed/fractal/src/main.tsx‎ renamed to ‎frameworks/keyed/whatsup/src/main.tsx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { observable, computed, factor, list, Stream, Fractal, Observable, Event, List, Context } from '@fract/core'
2-
import { render } from '@fract/jsx'
1+
import { conse, cause, list, Stream, Fractal, Conse, Event, List, Context } from 'whatsup'
2+
import { render } from '@whatsup/jsx'
33

44
// prettier-ignore
55
const A = ['pretty', 'large', 'big', 'small', 'tall', 'short', 'long', 'handsome', 'plain', 'quaint', 'clean', 'elegant', 'easy', 'angry', 'crazy', 'helpful', 'mushy', 'odd', 'unsightly', 'adorable', 'important', 'inexpensive', 'cheap', 'expensive', 'fancy']
@@ -12,8 +12,6 @@ function rnd(max: number) {
1212
return Math.round(Math.random() * 1000) % max
1313
}
1414

15-
const Selected = factor<Observable<number>>()
16-
1715
class SelectRowEvent extends Event {
1816
constructor(readonly row: Row) {
1917
super()
@@ -26,20 +24,22 @@ class DeleteRowEvent extends Event {
2624
}
2725
}
2826

27+
class SelectedRowId extends Conse<number> {}
28+
2929
class Row extends Fractal<JSX.Element> {
3030
readonly id: number
31-
readonly label: Observable<string>
31+
readonly label: Conse<string>
3232

3333
constructor(id: number, label: string) {
3434
super()
3535
this.id = id
36-
this.label = observable(label)
36+
this.label = conse(label)
3737
}
3838

39-
*stream(ctx: Context) {
39+
*whatsUp(ctx: Context) {
4040
const { id } = this
41-
const selected = ctx.get(Selected)!
42-
const className = computed(function* () {
41+
const selected = ctx.find(SelectedRowId)!
42+
const className = cause(function* () {
4343
while (true) {
4444
yield (yield* selected) === id ? 'danger' : ''
4545
}
@@ -68,7 +68,7 @@ class Row extends Fractal<JSX.Element> {
6868

6969
class Main extends Fractal<JSX.Element> {
7070
readonly rows = list<Row>([])
71-
readonly selected = observable<number>(NaN)
71+
readonly selected = new SelectedRowId(NaN)
7272
private nextRowId = 1
7373

7474
private buildRows(count = 1000) {
@@ -129,8 +129,8 @@ class Main extends Fractal<JSX.Element> {
129129
}
130130
}
131131

132-
*stream(ctx: Context) {
133-
ctx.set(Selected, this.selected)
132+
*whatsUp(ctx: Context) {
133+
ctx.share(this.selected)
134134
ctx.on(SelectRowEvent, (e) => this.select(e.row))
135135
ctx.on(DeleteRowEvent, (e) => this.delete(e.row))
136136

@@ -147,7 +147,7 @@ class Main extends Fractal<JSX.Element> {
147147
<div className="jumbotron">
148148
<div className="row">
149149
<div className="col-md-6">
150-
<h1>fractal</h1>
150+
<h1>WhatsUp</h1>
151151
</div>
152152
<div className="col-md-6">
153153
<div className="row">

‎frameworks/keyed/fractal/tsconfig.json‎ renamed to ‎frameworks/keyed/whatsup/tsconfig.json‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
"lib": ["esnext", "dom"],
1616
"jsx": "preserve",
1717
"rootDir": "./src",
18-
"baseUrl": "./",
19-
"paths": {
20-
"*": ["src/*", "src/root/*", "node_modules/*"]
21-
}
18+
"baseUrl": "./"
2219
}
2320
}

‎frameworks/keyed/fractal/webpack.config.js‎ renamed to ‎frameworks/keyed/whatsup/webpack.config.js‎

File renamed without changes.

‎webdriver-ts-results/src/results.ts‎

Lines changed: 50 additions & 33 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)