Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: dynamic singleton headless content #334

Merged
merged 1 commit into from
Oct 29, 2021
Merged

fix: dynamic singleton headless content #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions demo/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,34 @@ function Singleton() {
);
}

function SingletonHeadlessDynamicContent() {
const [source, target] = useSingletonHeadless();
const [count, setCount] = useState(0);

useEffect(() => {
setInterval(() => {
setCount(c => c + 1);
}, 1000);
}, []);

return (
<>
<TippyHeadless
render={(attrs, content) => (
<ReactSpringBox {...attrs}>{content}</ReactSpringBox>
)}
singleton={source}
/>
<TippyHeadless content={count} singleton={target}>
<button>Reference</button>
</TippyHeadless>
<TippyHeadless content={count + 1} singleton={target}>
<button>Reference</button>
</TippyHeadless>
</>
);
}

function SingletonHeadless() {
const [source, target] = useSingletonHeadless({overrides: ['placement']});
const [enabled, setEnabled] = useState(false);
Expand Down Expand Up @@ -365,6 +393,8 @@ function App() {
<Singleton />
<h2>Singleton Headless</h2>
<SingletonHeadless />
<h2>Singleton Headless Dynamic Content</h2>
<SingletonHeadlessDynamicContent />
<h2>Nested Singleton</h2>
<NestedSingleton />
<h2>Plugins</h2>
Expand Down
37 changes: 22 additions & 15 deletions src/Tippy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,22 +71,27 @@ export default function TippyGenerator(tippy) {
if (render) {
computedProps = {
...props,
plugins: isSingletonMode
? [
...plugins,
{
fn: () => ({
onTrigger(_, event) {
const {content} = singleton.data.children.find(
({instance}) =>
instance.reference === event.currentTarget,
);
setSingletonContent(content);
plugins:
isSingletonMode && singleton.data != null
? [
...plugins,
{
fn() {
return {
onTrigger(instance, event) {
const node = singleton.data.children.find(
({instance}) =>
instance.reference === event.currentTarget,
);
instance.state.$$activeSingletonInstance =
node.instance;
setSingletonContent(node.content);
},
};
},
}),
},
]
: plugins,
},
]
: plugins,
render: () => ({popper: mutableBox.container}),
};
}
Expand Down Expand Up @@ -120,6 +125,7 @@ export default function TippyGenerator(tippy) {
instance,
content,
props: computedProps,
setSingletonContent,
});
}

Expand Down Expand Up @@ -165,6 +171,7 @@ export default function TippyGenerator(tippy) {
instance,
content,
props: computedProps,
setSingletonContent,
});
}
});
Expand Down
24 changes: 15 additions & 9 deletions src/useSingleton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export default function useSingletonGenerator(createSingleton) {
data: mutableBox,
hook(data) {
mutableBox.sourceData = data;
mutableBox.setSingletonContent = data.setSingletonContent;
},
cleanup() {
mutableBox.sourceData = null;
Expand All @@ -103,18 +104,23 @@ export default function useSingletonGenerator(createSingleton) {

const target = {
hook(data) {
mutableBox.children = mutableBox.children.filter(
({instance}) => data.instance !== instance,
);
mutableBox.children.push(data);

if (
!mutableBox.children.find(
({instance}) => data.instance === instance,
)
mutableBox.instance?.state.isMounted &&
mutableBox.instance?.state.$$activeSingletonInstance ===
data.instance
) {
mutableBox.children.push(data);
mutableBox.setSingletonContent?.(data.content);
}

if (mutableBox.instance && !mutableBox.instance.state.isDestroyed) {
mutableBox.instance.setInstances(
mutableBox.children.map(child => child.instance),
);
}
if (mutableBox.instance && !mutableBox.instance.state.isDestroyed) {
mutableBox.instance.setInstances(
mutableBox.children.map(child => child.instance),
);
}
},
cleanup(instance) {
Expand Down