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.

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

Add link preview on hover for Link plugin #209

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion packages/core/editor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@yoopta/editor",
"version": "4.6.3",
"version": "4.6.4-rc.1",
"license": "MIT",
"private": false,
"main": "dist/index.js",
Expand Down
9 changes: 5 additions & 4 deletions packages/core/editor/src/UI/Overlay/Overlay.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
import { FloatingOverlay } from '@floating-ui/react';
import { MouseEvent, ReactNode } from 'react';
import { MouseEvent, ReactNode, forwardRef } from 'react';

type Props = {
children: ReactNode;
lockScroll?: boolean;
className?: string;
onClick?: (e: MouseEvent) => void;
style?: React.CSSProperties;
};

const Overlay = (props: Props) => {
const Overlay = ({ className, onClick, children, lockScroll = true, ...rest }: Props) => {
return (
<FloatingOverlay lockScroll className={props.className} onClick={props.onClick}>
{props.children}
<FloatingOverlay lockScroll={lockScroll} className={className} onClick={onClick} {...rest}>
{children}
</FloatingOverlay>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const DEFAULT_HANDLERS: YooptaEditorContext = {
editor: {
id: '',

getBlock: () => undefined,
getBlock: () => null,
insertBlock: () => undefined,
insertBlocks: () => undefined,
updateBlock: () => undefined,
Expand Down
14 changes: 7 additions & 7 deletions packages/core/editor/src/editor/elements/updateElement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ export type UpdateElementOptions = {
path?: Path;
};

export type UpdateElement<TElementKeys, TElementProps> = {
type: TElementKeys;
props: TElementProps;
};
export type UpdateElement<TElementKeys extends string, TElementProps> = Partial<
Omit<SlateElement<TElementKeys, TElementProps>, 'id'>
>;

export function updateElement<TElementKeys extends string, TElementProps>(
editor: YooEditor,
Expand Down Expand Up @@ -37,12 +36,13 @@ export function updateElement<TElementKeys extends string, TElementProps>(
});

const elementToUpdate = elementEntry?.[0];
const elementToUpdatePath = elementEntry?.[1];

const props = elementToUpdate?.props || {};
const updatedNode = { props: { ...props, ...element.props } };
const updatedElement = { props: { ...props, ...element.props } };

Transforms.setNodes<SlateElement>(slate, updatedNode, {
at: options?.path || [0],
Transforms.setNodes<SlateElement>(slate, updatedElement, {
at: options?.path || elementToUpdatePath || [0],
match: (n) => Element.isElement(n) && n.type === element.type,
mode: 'lowest',
});
Expand Down
2 changes: 2 additions & 0 deletions packages/core/editor/src/parsers/deserializeHTML.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ export function deserializeHTML(editor: YooEditor, html: HTMLElement) {
console.log('pasted html', html);

const PLUGINS_NODE_NAME_MATCHERS_MAP = getMappedPluginByNodeNames(editor);
console.log('PLUGINS_NODE_NAME_MATCHERS_MAP', PLUGINS_NODE_NAME_MATCHERS_MAP);

const blocks = deserialize(editor, PLUGINS_NODE_NAME_MATCHERS_MAP, html).filter(isYooptaBlock) as YooptaBlockData[];

return blocks;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const addLink = (editor, url: string) => {
children: isCollapsed ? [{ text: url }] : [],
props: {
url,
target: '_blank',
target: '_self',
rel: 'noopener noreferrer',
},
} as SlateElement;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/exports/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@yoopta/exports",
"version": "4.6.3",
"version": "4.6.4-rc.1",
"description": "Serialize/deserialize exports in different formats for Yoopta-Editor",
"author": "Darginec05 <[email protected]>",
"homepage": "https://github.com/Darginec05/Editor-Yoopta#readme",
Expand Down
185 changes: 62 additions & 123 deletions packages/development/src/pages/dev/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,174 +52,113 @@ const BasicExample = () => {
tools={TOOLS}
readOnly={readOnly}
value={{
'36048c70-ce45-4fe6-ad92-70ef6810b88c': {
id: '36048c70-ce45-4fe6-ad92-70ef6810b88c',
'b5709c7d-c79b-4786-8d72-8a4d727163d4': {
id: 'b5709c7d-c79b-4786-8d72-8a4d727163d4',
value: [
{
id: '66260b1b-1efd-4d8f-b6cd-3342480deea7',
type: 'heading-two',
id: '03bbf41c-d9c0-44ed-90d9-1bd17c66f94f',
type: 'heading-one',
children: [
{
text: 'Built-in Constraints',
text: 'With custom renders ',
},
],
props: {
nodeType: 'block',
},
},
],
type: 'HeadingTwo',
type: 'HeadingOne',
meta: {
order: 0,
depth: 0,
},
},
'02fba3b4-f90e-4fe0-9284-9dff8cf5fa3b': {
id: '02fba3b4-f90e-4fe0-9284-9dff8cf5fa3b',
'1c07a2a9-9dba-4626-86f9-7fa0dd8c9f83': {
id: '1c07a2a9-9dba-4626-86f9-7fa0dd8c9f83',
value: [
{
id: '5ae35463-0542-4f9a-b3b2-8f86dc8a132f',
type: 'accordion-list',
id: 'a5db0166-46c1-4170-94f9-12d758cdc882',
type: 'callout',
children: [
{
id: 'c584e4fa-b735-4cd8-9c5e-a9f2ce765fbd',
type: 'accordion-list-item',
children: [
{
id: '310aa032-aa99-42e1-b9d4-664a68c0c0ef',
type: 'accordion-list-item-heading',
children: [
{
text: 'Built-in Constraints',
},
],
props: {
nodeType: 'block',
},
},
{
id: 'ad3fb9a9-1533-4080-82e1-c102a1e725c9',
type: 'accordion-list-item-content',
children: [
{
text: 'Slate editors come with a few built-in constraints out of the box. These constraints are there to make working with content much more predictable than standard contenteditable. All of the built-in logic in Slate depends on these constraints, so unfortunately you cannot omit them. They are...',
},
],
props: {
nodeType: 'block',
},
},
],
props: {
nodeType: 'block',
isExpanded: true,
},
text: 'This example will show you how to add custom renders to plugins',
},
],
props: {
theme: 'info',
},
},
],
type: 'Callout',
meta: {
order: 1,
depth: 0,
},
},
'18cb86e2-44df-4d76-94e0-cf71b78d8ee8': {
id: '18cb86e2-44df-4d76-94e0-cf71b78d8ee8',
value: [
{
id: '83810c57-3b88-4f94-95ff-632f5e8d6c3f',
type: 'heading-three',
children: [
{
id: 'caffa035-bfe1-40be-b5a6-e41fcd74f189',
type: 'accordion-list-item',
children: [
{
id: '4c5e2f14-4c1f-4a78-803a-27fae2d1fb5d',
type: 'accordion-list-item-heading',
children: [
{
text: 'Adding Constraints',
},
],
props: {
nodeType: 'block',
},
},
{
id: 'a1dc9763-e1fa-4e70-88b0-dfe335ae4344',
type: 'accordion-list-item-content',
children: [
{
text: "All Element nodes must contain at least one Text descendant — even Void Elements. If an element node does not contain any children, an empty text node will be added as its only child. This constraint exists to ensure that the selection's anchor and focus points (which rely on referencing text nodes) can always be placed inside any node. Without this, empty elements (or void elements) wouldn't be selectable.",
},
],
props: {
nodeType: 'block',
},
},
],
props: {
nodeType: 'block',
isExpanded: true,
},
text: 'Example with ',
},
{
id: '7a327ed3-b8d3-41a5-8292-64a2d82b57b6',
type: 'accordion-list-item',
text: '',
},
{
id: 'c59655ae-fae4-472a-8fb3-e776e35395ad',
type: 'link',
props: {
url: '/',
target: '_self',
rel: 'noreferrer',
title: 'next/image',
nodeType: 'inline',
},
children: [
{
id: 'e7b5774a-6bd7-47a1-b8d2-dddedcb28418',
type: 'accordion-list-item-heading',
children: [
{
text: 'Multi-pass Normalizing',
},
],
props: {
nodeType: 'block',
},
},
{
id: '093afe90-0e9a-4602-81f6-66c55abb7ad7',
type: 'accordion-list-item-content',
children: [
{
text: "To do this, you extend the normalizeNode function on the editor. The normalizeNode function gets called every time an operation is applied that inserts or updates a node (or its descendants), giving you the opportunity to ensure that the changes didn't leave it in an invalid state, and correcting the node if so.",
},
],
props: {
nodeType: 'block',
},
text: 'next/image',
},
],
props: {
nodeType: 'block',
isExpanded: true,
},
},
{
text: ' ',
},
],
props: {
nodeType: 'block',
},
},
],
type: 'Accordion',
type: 'HeadingThree',
meta: {
order: 1,
order: 2,
depth: 0,
},
},
'226f5963-b01c-4b14-a7e8-45f3cf6c6b95': {
id: '226f5963-b01c-4b14-a7e8-45f3cf6c6b95',
'ae04c7a1-fb94-4f0b-b428-3757a8d21196': {
id: 'ae04c7a1-fb94-4f0b-b428-3757a8d21196',
value: [
{
id: 'dcfc9ee2-db6e-4127-b40c-83bcd465c5dd',
type: 'embed',
props: {
sizes: {
width: 650,
height: 400,
},
nodeType: 'void',
provider: {
type: 'youtube',
id: 'bItAw5xgI4I',
url: 'https://www.youtube.com/watch?v=bItAw5xgI4I&t=468s',
},
},
id: '08a13b95-2371-4eac-9c30-83f1f8b72fc5',
type: 'callout',
children: [
{
text: '',
text: "By default, the @yoopta/image plugin provides its own image rendering. \nBut what if you want to change the default rendering with powerful components like next/image, which provide top-level optimization and rendering with different layout. So, it's easy-peasy. ",
},
],
props: {
theme: 'default',
},
},
],
type: 'Embed',
type: 'Callout',
meta: {
order: 2,
order: 3,
depth: 0,
},
},
Expand Down
12 changes: 8 additions & 4 deletions packages/development/src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@ import { useRouter } from 'next/router';
const Index = () => {
const router = useRouter();

useEffect(() => {
router.push('/dev');
});
// useEffect(() => {
// router.push('/dev');
// });

return null;
return (
<div>
<h1>Some markup</h1>
</div>
);
};

export default Index;
Loading
Loading