refactor: remove PostInfoProvider

DimensionDev · May 29, 2024 · f08a029 · f08a029
1 parent c5f5c4a
commit f08a029
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 20 deletions.
diff --git a/packages/mask/content-script/site-adaptor-infra/defaults/inject/Comments.tsx b/packages/mask/content-script/site-adaptor-infra/defaults/inject/Comments.tsx
@@ -1,5 +1,5 @@
 import { memo } from 'react'
-import { type PostInfo, PostInfoProvider } from '@masknet/plugin-infra/content-script'
+import { type PostInfo, PostInfoContext } from '@masknet/plugin-infra/content-script'
 import { MutationObserverWatcher } from '@dimensiondev/holoflows-kit'
 import { makeStyles } from '@masknet/theme'
 import { ValueRef } from '@masknet/shared-base'
@@ -36,9 +36,9 @@ export function injectPostCommentsDefault<T extends string>(
                 const needZipF = needZip || (() => undefined)
                 const root = attachReactTreeWithContainer(meta.afterShadow, { signal })
                 root.render(
-                    <PostInfoProvider post={current}>
+                    <PostInfoContext value={current}>
                         <PostCommentDefault needZip={needZipF} comment={commentRef} />
-                    </PostInfoProvider>,
+                    </PostInfoContext>,
                 )
                 return {
                     onNodeMutation() {

diff --git a/packages/mask/content-script/site-adaptor-infra/defaults/inject/PostActions.tsx b/packages/mask/content-script/site-adaptor-infra/defaults/inject/PostActions.tsx
@@ -1,5 +1,5 @@
 import { noop } from 'lodash-es'
-import { PostInfoProvider, type PostInfo } from '@masknet/plugin-infra/content-script'
+import { PostInfoContext, type PostInfo } from '@masknet/plugin-infra/content-script'
 import { PostActions } from '../../../components/InjectedComponents/PostActions.js'
 import { attachReactTreeWithContainer } from '../../../utils/shadow-root/renderInShadowRoot.js'
 
@@ -17,9 +17,9 @@ export function createPostActionsInjector() {
     return function injectPostActions(postInfo: PostInfo, signal: AbortSignal) {
         if (postInfo.actionsElement) {
             const jsx = (
-                <PostInfoProvider post={postInfo}>
+                <PostInfoContext value={postInfo}>
                     <PostActions />
-                </PostInfoProvider>
+                </PostInfoContext>
             )
             const root = attachReactTreeWithContainer(postInfo.actionsElement.afterShadow, {
                 tag: createRootElement,

diff --git a/packages/mask/content-script/site-adaptor-infra/defaults/inject/PostInspector.tsx b/packages/mask/content-script/site-adaptor-infra/defaults/inject/PostInspector.tsx
@@ -1,6 +1,6 @@
 import { memo } from 'react'
 import type { DOMProxy } from '@dimensiondev/holoflows-kit'
-import { type PostInfo, PostInfoProvider } from '@masknet/plugin-infra/content-script'
+import { type PostInfo, PostInfoContext } from '@masknet/plugin-infra/content-script'
 import { attachReactTreeWithContainer } from '../../../utils/shadow-root/renderInShadowRoot.js'
 import { PostInspector, type PostInspectorProps } from '../../../components/InjectedComponents/PostInspector.js'
 import { noop } from 'lodash-es'
@@ -18,9 +18,9 @@ export function injectPostInspectorDefault(
 
     return function injectPostInspector(current: PostInfo, signal: AbortSignal) {
         const jsx = (
-            <PostInfoProvider post={current}>
+            <PostInfoContext value={current}>
                 <PostInspectorDefault {...props} zipPost={() => zipPostF(current.rootElement)} />
-            </PostInfoProvider>
+            </PostInfoContext>
         )
         const root = attachReactTreeWithContainer(injectionPoint?.(current) ?? current.rootElement.afterShadow, {
             key: 'post-inspector',

diff --git a/packages/mask/content-script/site-adaptor-infra/defaults/inject/PostReplacer.tsx b/packages/mask/content-script/site-adaptor-infra/defaults/inject/PostReplacer.tsx
@@ -1,6 +1,6 @@
 import { memo } from 'react'
 import type { DOMProxy } from '@dimensiondev/holoflows-kit'
-import { PostInfoProvider, type PostInfo } from '@masknet/plugin-infra/content-script'
+import { PostInfoContext, type PostInfo } from '@masknet/plugin-infra/content-script'
 import { attachReactTreeWithContainer } from '../../../utils/shadow-root/renderInShadowRoot.js'
 import { PostReplacer, type PostReplacerProps } from '../../../components/InjectedComponents/PostReplacer.js'
 
@@ -25,13 +25,13 @@ export function injectPostReplacer({ zipPost, unzipPost }: InjectPostReplacerCon
             untilVisible: true,
             signal,
         }).render(
-            <PostInfoProvider post={current}>
+            <PostInfoContext value={current}>
                 <PostReplacerDefault
                     zipPost={() => zipPost(current.rootElement)}
                     unZipPost={() => unzipPost(current.rootElement)}
                     {...current}
                 />
-            </PostInfoProvider>,
+            </PostInfoContext>,
         )
     }
 }
diff --git a/packages/mask/content-script/site-adaptors/mirror.xyz/injection/PostActions/index.tsx b/packages/mask/content-script/site-adaptors/mirror.xyz/injection/PostActions/index.tsx
@@ -3,7 +3,7 @@ import { Plugin } from '@masknet/plugin-infra'
 import {
     createInjectHooksRenderer,
     type PostInfo,
-    PostInfoProvider,
+    PostInfoContext,
     useActivatedPluginsSiteAdaptor,
     usePostInfoDetails,
 } from '@masknet/plugin-infra/content-script'
@@ -50,9 +50,9 @@ function createPostActionsInjector() {
     return function injectPostActions(postInfo: PostInfo, signal: AbortSignal) {
         const jsx = (
             <EVMWeb3ContextProvider>
-                <PostInfoProvider post={postInfo}>
+                <PostInfoContext value={postInfo}>
                     <PostActions />
-                </PostInfoProvider>
+                </PostInfoContext>
             </EVMWeb3ContextProvider>
         )
         if (postInfo.actionsElement) {

diff --git a/packages/plugin-infra/src/entry-content-script.ts b/packages/plugin-infra/src/entry-content-script.ts
@@ -17,7 +17,6 @@ export {
     type PostContextActions,
     type PostInfo,
     PostInfoContext,
-    PostInfoProvider,
     usePostInfoDetails,
     type CompositionType,
     CompositionContext,

diff --git a/packages/plugin-infra/src/site-adaptor/PostContext.tsx b/packages/plugin-infra/src/site-adaptor/PostContext.tsx
@@ -114,10 +114,6 @@ export type PostInfo = PostContext
 export const PostInfoContext = createContext<PostContext | null>(null)
 PostInfoContext.displayName = 'PostInfoContext'
 
-/** @deprecated use <PostInfoContext.Provider value={post}> */
-export function PostInfoProvider(props: React.PropsWithChildren<{ post: PostInfo }>) {
-    return <PostInfoContext value={props.post}>{props.children}</PostInfoContext>
-}
 export const usePostInfoDetails: {
     // Change to use* when https://github.com/microsoft/TypeScript/issues/44643 fixed
     [key in keyof PostInfo]: () => PostInfo[key] extends ValueRef<infer T> ? T