Skip to content

Commit 68d5d94

Browse files
committed
Merge branch 'voliva-upgrade-react-rxjs'
2 parents 14c2108 + 1d051bd commit 68d5d94

File tree

3 files changed

+101
-71
lines changed

3 files changed

+101
-71
lines changed

frameworks/keyed/react-rxjs/package-lock.json

+91-61
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

frameworks/keyed/react-rxjs/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
"webpack-cli": "3.3.4"
3333
},
3434
"dependencies": {
35-
"@react-rxjs/core": "0.6.0",
36-
"react": "17.0.1",
37-
"react-dom": "17.0.1",
38-
"rxjs": "6.6.3"
35+
"@react-rxjs/core": "0.9.8",
36+
"react": "18.2.0",
37+
"react-dom": "18.2.0",
38+
"rxjs": "7.5.6"
3939
}
40-
}
40+
}

frameworks/keyed/react-rxjs/src/main.jsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from "react";
22
import ReactDOM from "react-dom";
33
import { Subject } from "rxjs";
44
import { scan } from "rxjs/operators";
5-
import { bind } from "@react-rxjs/core";
5+
import { state, useStateObservable } from "@react-rxjs/core";
66

77
const A = [
88
"pretty",
@@ -86,7 +86,7 @@ const onSwap = () => rowEvents$.next({ type: "swap" });
8686
const onRemove = (payload) => rowEvents$.next({ type: "remove", payload });
8787

8888
const init = [];
89-
const [useItems] = bind(
89+
const items$ = state(
9090
rowEvents$.pipe(
9191
scan((data, action) => {
9292
switch (action.type) {
@@ -126,7 +126,7 @@ const selected$ = new Subject();
126126
const onSelect = (id) => {
127127
selected$.next(id);
128128
};
129-
const [useSelectedId] = bind(selected$, 0);
129+
const selectedId$ = state(selected$, 0);
130130

131131
const GlyphIcon = (
132132
<span className="glyphicon glyphicon-remove" aria-hidden="true"></span>
@@ -148,8 +148,8 @@ const Row = React.memo(({ item, isSelected }) => {
148148
});
149149

150150
const RowList = () => {
151-
const rows = useItems();
152-
const selecteId = useSelectedId();
151+
const rows = useStateObservable(items$);
152+
const selecteId = useStateObservable(selectedId$);
153153
return rows.map((item) => (
154154
<Row key={item.id} item={item} isSelected={selecteId === item.id} />
155155
));

0 commit comments

Comments
 (0)