Skip to content

Commit 563720a

Browse files
dai-shidai-shi
committed
we assume ConcurrentMode enables StrictMode by default
1 parent 437e876 commit 563720a

File tree

8 files changed

+83
-106
lines changed

8 files changed

+83
-106
lines changed

‎examples/01_minimal/src/index.js

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-env browser */
22

3-
import React, { StrictMode, unstable_ConcurrentMode as ConcurrentMode } from 'react';
3+
import React, { unstable_ConcurrentMode as ConcurrentMode } from 'react';
44
import ReactDOM from 'react-dom';
55
import { createStore } from 'redux';
66

@@ -56,18 +56,16 @@ const TextBox = () => {
5656
};
5757

5858
const App = () => (
59-
<StrictMode>
60-
<ConcurrentMode>
61-
<ReduxProvider store={store}>
62-
<h1>Counter</h1>
63-
<Counter />
64-
<Counter />
65-
<h1>TextBox</h1>
66-
<TextBox />
67-
<TextBox />
68-
</ReduxProvider>
69-
</ConcurrentMode>
70-
</StrictMode>
59+
<ConcurrentMode>
60+
<ReduxProvider store={store}>
61+
<h1>Counter</h1>
62+
<Counter />
63+
<Counter />
64+
<h1>TextBox</h1>
65+
<TextBox />
66+
<TextBox />
67+
</ReduxProvider>
68+
</ConcurrentMode>
7169
);
7270

7371
ReactDOM.render(<App />, document.getElementById('app'));

‎examples/02_typescript/src/App.tsx

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,23 @@ import Counter from './Counter';
99
import Person from './Person';
1010

1111
const {
12-
StrictMode,
1312
// @ts-ignore
1413
unstable_ConcurrentMode: ConcurrentMode,
1514
} = React;
1615

1716
const store = createStore(reducer);
1817

1918
const App = () => (
20-
<StrictMode>
21-
<ConcurrentMode>
22-
<ReduxProvider store={store}>
23-
<h1>Counter</h1>
24-
<Counter />
25-
<Counter />
26-
<h1>Person</h1>
27-
<Person />
28-
<Person />
29-
</ReduxProvider>
30-
</ConcurrentMode>
31-
</StrictMode>
19+
<ConcurrentMode>
20+
<ReduxProvider store={store}>
21+
<h1>Counter</h1>
22+
<Counter />
23+
<Counter />
24+
<h1>Person</h1>
25+
<Person />
26+
<Person />
27+
</ReduxProvider>
28+
</ConcurrentMode>
3229
);
3330

3431
export default App;

‎examples/03_deep/src/App.tsx

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,23 @@ import Counter from './Counter';
99
import Person from './Person';
1010

1111
const {
12-
StrictMode,
1312
// @ts-ignore
1413
unstable_ConcurrentMode: ConcurrentMode,
1514
} = React;
1615

1716
const store = createStore(reducer);
1817

1918
const App = () => (
20-
<StrictMode>
21-
<ConcurrentMode>
22-
<ReduxProvider store={store}>
23-
<h1>Counter</h1>
24-
<Counter />
25-
<Counter />
26-
<h1>Person</h1>
27-
<Person />
28-
<Person />
29-
</ReduxProvider>
30-
</ConcurrentMode>
31-
</StrictMode>
19+
<ConcurrentMode>
20+
<ReduxProvider store={store}>
21+
<h1>Counter</h1>
22+
<Counter />
23+
<Counter />
24+
<h1>Person</h1>
25+
<Person />
26+
<Person />
27+
</ReduxProvider>
28+
</ConcurrentMode>
3229
);
3330

3431
export default App;

‎examples/04_immer/src/App.tsx

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,23 @@ import Counter from './Counter';
99
import Person from './Person';
1010

1111
const {
12-
StrictMode,
1312
// @ts-ignore
1413
unstable_ConcurrentMode: ConcurrentMode,
1514
} = React;
1615

1716
const store = createStore(reducer);
1817

1918
const App = () => (
20-
<StrictMode>
21-
<ConcurrentMode>
22-
<ReduxProvider store={store}>
23-
<h1>Counter</h1>
24-
<Counter />
25-
<Counter />
26-
<h1>Person</h1>
27-
<Person />
28-
<Person />
29-
</ReduxProvider>
30-
</ConcurrentMode>
31-
</StrictMode>
19+
<ConcurrentMode>
20+
<ReduxProvider store={store}>
21+
<h1>Counter</h1>
22+
<Counter />
23+
<Counter />
24+
<h1>Person</h1>
25+
<Person />
26+
<Person />
27+
</ReduxProvider>
28+
</ConcurrentMode>
3229
);
3330

3431
export default App;

‎examples/05_localstate/src/App.tsx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,21 @@ import { reducer } from './state';
88
import Counter from './Counter';
99

1010
const {
11-
StrictMode,
1211
// @ts-ignore
1312
unstable_ConcurrentMode: ConcurrentMode,
1413
} = React;
1514

1615
const store = createStore(reducer);
1716

1817
const App = () => (
19-
<StrictMode>
20-
<ConcurrentMode>
21-
<ReduxProvider store={store}>
22-
<h1>Counter</h1>
23-
<Counter />
24-
<h1>Counter</h1>
25-
<Counter />
26-
</ReduxProvider>
27-
</ConcurrentMode>
28-
</StrictMode>
18+
<ConcurrentMode>
19+
<ReduxProvider store={store}>
20+
<h1>Counter</h1>
21+
<Counter />
22+
<h1>Counter</h1>
23+
<Counter />
24+
</ReduxProvider>
25+
</ConcurrentMode>
2926
);
3027

3128
export default App;

‎examples/06_memoization/src/App.tsx

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,23 @@ import Counter from './Counter';
99
import Person from './Person';
1010

1111
const {
12-
StrictMode,
1312
// @ts-ignore
1413
unstable_ConcurrentMode: ConcurrentMode,
1514
} = React;
1615

1716
const store = createStore(reducer);
1817

1918
const App = () => (
20-
<StrictMode>
21-
<ConcurrentMode>
22-
<ReduxProvider store={store}>
23-
<h1>Counter</h1>
24-
<Counter />
25-
<Counter />
26-
<h1>Person</h1>
27-
<Person />
28-
<Person />
29-
</ReduxProvider>
30-
</ConcurrentMode>
31-
</StrictMode>
19+
<ConcurrentMode>
20+
<ReduxProvider store={store}>
21+
<h1>Counter</h1>
22+
<Counter />
23+
<Counter />
24+
<h1>Person</h1>
25+
<Person />
26+
<Person />
27+
</ReduxProvider>
28+
</ConcurrentMode>
3229
);
3330

3431
export default App;

‎examples/07_multistore/src/App.tsx

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import Person from './Person';
1010

1111
const {
1212
useState,
13-
StrictMode,
1413
// @ts-ignore
1514
unstable_ConcurrentMode: ConcurrentMode,
1615
} = React;
@@ -21,22 +20,20 @@ const store2 = createStore(reducer);
2120
const App = () => {
2221
const [store, setStore] = useState(store1);
2322
return (
24-
<StrictMode>
25-
<ConcurrentMode>
26-
<div>
27-
<button type="button" onClick={() => setStore(store1)}>store1</button>
28-
<button type="button" onClick={() => setStore(store2)}>store2</button>
29-
<ReduxProvider store={store}>
30-
<h1>Counter</h1>
31-
<Counter />
32-
<Counter />
33-
<h1>Person</h1>
34-
<Person />
35-
<Person />
36-
</ReduxProvider>
37-
</div>
38-
</ConcurrentMode>
39-
</StrictMode>
23+
<ConcurrentMode>
24+
<div>
25+
<button type="button" onClick={() => setStore(store1)}>store1</button>
26+
<button type="button" onClick={() => setStore(store2)}>store2</button>
27+
<ReduxProvider store={store}>
28+
<h1>Counter</h1>
29+
<Counter />
30+
<Counter />
31+
<h1>Person</h1>
32+
<Person />
33+
<Person />
34+
</ReduxProvider>
35+
</div>
36+
</ConcurrentMode>
4037
);
4138
};
4239

‎examples/08_dynamic/src/App.tsx

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,23 @@ import Counter from './Counter';
99
import Person from './Person';
1010

1111
const {
12-
StrictMode,
1312
// @ts-ignore
1413
unstable_ConcurrentMode: ConcurrentMode,
1514
} = React;
1615

1716
const store = createStore(reducer);
1817

1918
const App = () => (
20-
<StrictMode>
21-
<ConcurrentMode>
22-
<ReduxProvider store={store}>
23-
<h1>Counter</h1>
24-
<Counter />
25-
<Counter />
26-
<h1>Person</h1>
27-
<Person />
28-
<Person />
29-
</ReduxProvider>
30-
</ConcurrentMode>
31-
</StrictMode>
19+
<ConcurrentMode>
20+
<ReduxProvider store={store}>
21+
<h1>Counter</h1>
22+
<Counter />
23+
<Counter />
24+
<h1>Person</h1>
25+
<Person />
26+
<Person />
27+
</ReduxProvider>
28+
</ConcurrentMode>
3229
);
3330

3431
export default App;

0 commit comments

Comments
 (0)