Skip to content

Commit 701235e

Browse files
committed
fix conflicts
1 parent c2810db commit 701235e

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

src/content/reference/react/apis.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,12 @@ translators:
1313

1414
---
1515

16-
<<<<<<< HEAD
1716
* [`createContext`](/reference/react/createContext) API 可以创建一个 context,你可以将其提供给子组件,通常会与 [`useContext`](/reference/react/useContext) 一起配合使用。
1817
* [`forwardRef`](/reference/react/forwardRef) 允许组件将 DOM 节点作为 ref 暴露给父组件。
1918
* [`lazy`](/reference/react/lazy) 允许你延迟加载组件,直到该组件需要第一次被渲染。
2019
* [`memo`](/reference/react/memo) 允许你在 props 没有变化的情况下跳过组件的重渲染。通常 [`useMemo`](/reference/react/useMemo)[`useCallback`](/reference/react/useCallback) 会一起配合使用。
2120
* [`startTransition`](/reference/react/startTransition) 允许你可以标记一个状态更新是不紧急的。类似于 [`useTransition`](/reference/react/useTransition)
22-
=======
23-
* [`createContext`](/reference/react/createContext) lets you define and provide context to the child components. Used with [`useContext`.](/reference/react/useContext)
24-
* [`forwardRef`](/reference/react/forwardRef) lets your component expose a DOM node as a ref to the parent. Used with [`useRef`.](/reference/react/useRef)
25-
* [`lazy`](/reference/react/lazy) lets you defer loading a component's code until it's rendered for the first time.
26-
* [`memo`](/reference/react/memo) lets your component skip re-renders with same props. Used with [`useMemo`](/reference/react/useMemo) and [`useCallback`.](/reference/react/useCallback)
27-
* [`startTransition`](/reference/react/startTransition) lets you mark a state update as non-urgent. Similar to [`useTransition`.](/reference/react/useTransition)
28-
* [`act`](/reference/react/act) lets you wrap renders and interactions in tests to ensure updates have processed before making assertions.
29-
>>>>>>> 12fca4c24f218daea883080db476fb71ed160f36
30-
21+
* [`act`](/reference/react/act) 允许你在测试中包装渲染和交互,以确保在断言之前已完成更新。
3122
---
3223

3324
## Resource APIs {/*resource-apis*/}

src/sidebarReference.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -346,13 +346,8 @@
346346
"path": "/reference/rules",
347347
"routes": [
348348
{
349-
<<<<<<< HEAD
350-
"title": "组件和 Hook 必须是纯粹的",
351-
"path": "/reference/rules/components-and-hooks-must-be-pure"
352-
=======
353-
"title": "Components and Hooks must be pure",
349+
"title": "组件和 Hook 必须是纯粹的",
354350
"path": "/reference/rules/components-and-hooks-must-be-pure"
355-
>>>>>>> 12fca4c24f218daea883080db476fb71ed160f36
356351
},
357352
{
358353
"title": "React 调用组件和 Hook",
@@ -438,4 +433,4 @@
438433
]
439434
}
440435
]
441-
}
436+
}

0 commit comments

Comments
 (0)