+9

.claude/settings.local.json

··· 1 1 + { 2 2 + "permissions": { 3 3 + "allow": [ 4 4 + "mcp__acp__Edit", 5 5 + "mcp__acp__Write", 6 6 + "mcp__acp__Bash" 7 7 + ] 8 8 + } 9 9 + }

-1

.github/pull_request_template.md

··· 2 2 - it looks good on both mobile and desktop 3 3 - it undo's like it ought to 4 4 - it handles keyboard interactions reasonably well 5 5 - - it behaves as you would expect if you lock it 6 5 - no build errors!!!

+17 -1

app/[leaflet_id]/Footer.tsx

··· 8 8 import { HomeButton } from "app/[leaflet_id]/actions/HomeButton"; 9 9 import { PublishButton } from "./actions/PublishButton"; 10 10 import { useEntitySetContext } from "components/EntitySetProvider"; 11 11 - import { HelpButton } from "app/[leaflet_id]/actions/HelpButton"; 12 11 import { Watermark } from "components/Watermark"; 13 12 import { BackToPubButton } from "./actions/BackToPubButton"; 14 13 import { useLeafletPublicationData } from "components/PageSWRDataProvider"; 15 14 import { useIdentityData } from "components/IdentityProvider"; 15 15 + import { useEntity } from "src/replicache"; 16 16 + import { block } from "sharp"; 16 17 18 18 + export function hasBlockToolbar(blockType: string | null | undefined) { 19 19 + return ( 20 20 + blockType === "text" || 21 21 + blockType === "heading" || 22 22 + blockType === "blockquote" || 23 23 + blockType === "button" || 24 24 + blockType === "datetime" || 25 25 + blockType === "image" 26 26 + ); 27 27 + } 17 28 export function LeafletFooter(props: { entityID: string }) { 18 29 let focusedBlock = useUIState((s) => s.focusedEntity); 30 30 + 19 31 let entity_set = useEntitySetContext(); 20 32 let { identity } = useIdentityData(); 21 33 let { data: pub } = useLeafletPublicationData(); 34 34 + let blockType = useEntity(focusedBlock?.entityID || null, "block/type")?.data 35 35 + .value; 22 36 23 37 return ( 24 38 <Media mobile className="mobileFooter w-full z-10 touch-none -mt-[54px] "> 25 39 {focusedBlock && 26 40 focusedBlock.entityType == "block" && 41 41 + hasBlockToolbar(blockType) && 27 42 entity_set.permissions.write ? ( 28 43 <div 29 44 className="w-full z-10 p-2 flex bg-bg-page pwa-padding-bottom" ··· 34 49 <Toolbar 35 50 pageID={focusedBlock.parent} 36 51 blockID={focusedBlock.entityID} 52 52 + blockType={blockType} 37 53 /> 38 54 </div> 39 55 ) : entity_set.permissions.write ? (

+2

app/globals.css

··· 274 274 @apply p-2; 275 275 @apply rounded-md; 276 276 @apply overflow-auto; 277 277 + @apply sm:min-h-12; 278 278 + @apply min-h-10; 277 279 278 280 @media (min-width: 640px) { 279 281 @apply p-3;

-1

app/lish/[did]/[publication]/icon/route.ts

··· 14 14 request: NextRequest, 15 15 props: { params: Promise<{ did: string; publication: string }> }, 16 16 ) { 17 17 - console.log("are we getting here?"); 18 17 const params = await props.params; 19 18 try { 20 19 let did = decodeURIComponent(params.did);

+141 -67

components/Blocks/Block.tsx

··· 33 33 import { deepEquals } from "src/utils/deepEquals"; 34 34 import { isTextBlock } from "src/utils/isTextBlock"; 35 35 import { focusPage } from "src/utils/focusPage"; 36 36 + import { DeleteTiny } from "components/Icons/DeleteTiny"; 37 37 + import { ArrowDownTiny } from "components/Icons/ArrowDownTiny"; 38 38 + import { Separator } from "components/Layout"; 39 39 + import { moveBlockUp, moveBlockDown } from "src/utils/moveBlock"; 40 40 + import { deleteBlock } from "src/utils/deleteBlock"; 36 41 37 42 export type Block = { 38 43 factID: string; ··· 63 68 // Block handles all block level events like 64 69 // mouse events, keyboard events and longPress, and setting AreYouSure state 65 70 // and shared styling like padding and flex for list layouting 66 66 - let { rep } = useReplicache(); 67 71 let mouseHandlers = useBlockMouseHandlers(props); 68 72 let handleDrop = useHandleDrop({ 69 73 parent: props.parent, ··· 72 76 }); 73 77 let entity_set = useEntitySetContext(); 74 78 75 75 - let { isLongPress, handlers } = useLongPress(() => { 79 79 + let { isLongPress, longPressHandlers } = useLongPress(() => { 76 80 if (isTextBlock[props.type]) return; 77 81 if (isLongPress.current) { 78 82 focusBlock( ··· 85 89 let selected = useUIState( 86 90 (s) => !!s.selectedBlocks.find((b) => b.value === props.entityID), 87 91 ); 92 92 + let alignment = useEntity(props.value, "block/text-alignment")?.data.value; 93 93 + 94 94 + let alignmentStyle = 95 95 + props.type === "button" || props.type === "image" 96 96 + ? "justify-center" 97 97 + : "justify-start"; 98 98 + 99 99 + if (alignment) 100 100 + alignmentStyle = { 101 101 + left: "justify-start", 102 102 + right: "justify-end", 103 103 + center: "justify-center", 104 104 + justify: "justify-start", 105 105 + }[alignment]; 88 106 89 107 let [areYouSure, setAreYouSure] = useState(false); 90 108 useEffect(() => { ··· 98 116 99 117 return ( 100 118 <div 101 101 - {...(!props.preview ? { ...mouseHandlers, ...handlers } : {})} 119 119 + {...(!props.preview ? { ...mouseHandlers, ...longPressHandlers } : {})} 102 120 id={ 103 121 !props.preview ? elementId.block(props.entityID).container : undefined 104 122 } ··· 117 135 blockWrapper relative 118 136 flex flex-row gap-2 119 137 px-3 sm:px-4 138 138 + z-1 w-full 139 139 + ${alignmentStyle} 120 140 ${ 121 141 !props.nextBlock 122 142 ? "pb-3 sm:pb-4" ··· 255 275 ) => { 256 276 // BaseBlock renders the actual block content, delete states, controls spacing between block and list markers 257 277 let BlockTypeComponent = BlockTypeComponents[props.type]; 258 258 - let alignment = useEntity(props.value, "block/text-alignment")?.data.value; 259 259 - 260 260 - let alignmentStyle = 261 261 - props.type === "button" || props.type === "image" 262 262 - ? "justify-center" 263 263 - : "justify-start"; 264 264 - 265 265 - if (alignment) 266 266 - alignmentStyle = { 267 267 - left: "justify-start", 268 268 - right: "justify-end", 269 269 - center: "justify-center", 270 270 - justify: "justify-start", 271 271 - }[alignment]; 272 278 273 279 if (!BlockTypeComponent) return <div>unknown block</div>; 274 280 return ( 275 275 - <div 276 276 - className={`blockContentWrapper w-full grow flex gap-2 z-1 ${alignmentStyle}`} 277 277 - > 281 281 + <> 278 282 {props.listData && <ListMarker {...props} />} 279 283 {props.areYouSure ? ( 280 284 <AreYouSure ··· 287 291 ) : ( 288 292 <BlockTypeComponent {...props} preview={props.preview} /> 289 293 )} 290 290 - </div> 294 294 + </> 291 295 ); 292 296 }; 293 297 ··· 326 330 s.selectedBlocks.length > 1, 327 331 ); 328 332 329 329 - let isSelected = useUIState((s) => 330 330 - s.selectedBlocks.find((b) => b.value === props.entityID), 331 331 - ); 332 332 - let isLocked = useEntity(props.value, "block/is-locked"); 333 333 - 334 333 let nextBlockSelected = useUIState((s) => 335 334 s.selectedBlocks.find((b) => b.value === props.nextBlock?.value), 336 335 ); ··· 338 337 s.selectedBlocks.find((b) => b.value === props.previousBlock?.value), 339 338 ); 340 339 341 341 - if (isMultiselected || (isLocked?.data.value && isSelected)) 342 342 - // not sure what multiselected and selected classes are doing (?) 343 343 - // use a hashed pattern for locked things. show this pattern if the block is selected, even if it isn't multiselected 344 344 - 340 340 + if (isMultiselected) 345 341 return ( 346 342 <> 347 343 <div ··· 354 350 ${!prevBlockSelected && "rounded-t-md"} 355 351 ${!nextBlockSelected && "rounded-b-md"} 356 352 `} 357 357 - style={ 358 358 - isLocked?.data.value 359 359 - ? { 360 360 - maskImage: "var(--hatchSVG)", 361 361 - maskRepeat: "repeat repeat", 362 362 - } 363 363 - : {} 364 364 - } 365 365 - ></div> 366 366 - {isLocked?.data.value && ( 367 367 - <div 368 368 - className={` 369 369 - blockSelectionLockIndicator z-10 370 370 - flex items-center 371 371 - text-border rounded-full 372 372 - absolute right-3 373 373 - 374 374 - ${ 375 375 - props.type === "heading" || props.type === "text" 376 376 - ? "top-[6px]" 377 377 - : "top-0" 378 378 - }`} 379 379 - > 380 380 - <LockTiny className="bg-bg-page p-0.5 rounded-full w-5 h-5" /> 381 381 - </div> 382 382 - )} 353 353 + /> 383 354 </> 384 355 ); 385 356 }; 386 357 387 358 export const BlockLayout = (props: { 388 388 - isSelected?: boolean; 359 359 + isSelected: boolean; 389 360 children: React.ReactNode; 390 361 className?: string; 362 362 + optionsClassName?: string; 391 363 hasBackground?: "accent" | "page"; 392 364 borderOnHover?: boolean; 365 365 + hasAlignment?: boolean; 366 366 + areYouSure?: boolean; 367 367 + setAreYouSure?: (value: boolean) => void; 393 368 }) => { 369 369 + // this is used to wrap non-text blocks in consistent selected styling, spacing, and top level options like delete 394 370 return ( 395 371 <div 396 396 - className={`block ${props.className} p-2 sm:p-3 w-full overflow-hidden 372 372 + className={`nonTextBlockAndControls relative ${props.hasAlignment ? "w-fit" : "w-full"}`} 373 373 + > 374 374 + <div 375 375 + className={`nonTextBlock ${props.className} p-2 sm:p-3 overflow-hidden 376 376 + ${props.hasAlignment ? "w-fit" : "w-full"} 397 377 ${props.isSelected ? "block-border-selected " : "block-border"} 398 378 ${props.borderOnHover && "hover:border-accent-contrast! hover:outline-accent-contrast! focus-within:border-accent-contrast! focus-within:outline-accent-contrast!"}`} 399 399 - style={{ 400 400 - backgroundColor: 401 401 - props.hasBackground === "accent" 402 402 - ? "var(--accent-light)" 403 403 - : props.hasBackground === "page" 404 404 - ? "rgb(var(--bg-page))" 405 405 - : "transparent", 406 406 - }} 379 379 + style={{ 380 380 + backgroundColor: 381 381 + props.hasBackground === "accent" 382 382 + ? "var(--accent-light)" 383 383 + : props.hasBackground === "page" 384 384 + ? "rgb(var(--bg-page))" 385 385 + : "transparent", 386 386 + }} 387 387 + > 388 388 + {props.children} 389 389 + </div> 390 390 + {props.isSelected && ( 391 391 + <NonTextBlockOptions 392 392 + optionsClassName={props.optionsClassName} 393 393 + areYouSure={props.areYouSure} 394 394 + setAreYouSure={props.setAreYouSure} 395 395 + /> 396 396 + )} 397 397 + </div> 398 398 + ); 399 399 + }; 400 400 + 401 401 + let debounced: null | number = null; 402 402 + 403 403 + const NonTextBlockOptions = (props: { 404 404 + areYouSure?: boolean; 405 405 + setAreYouSure?: (value: boolean) => void; 406 406 + optionsClassName?: string; 407 407 + }) => { 408 408 + let { rep } = useReplicache(); 409 409 + let entity_set = useEntitySetContext(); 410 410 + let focusedEntity = useUIState((s) => s.focusedEntity); 411 411 + let focusedEntityType = useEntity( 412 412 + focusedEntity?.entityType === "page" 413 413 + ? focusedEntity.entityID 414 414 + : focusedEntity?.parent || null, 415 415 + "page/type", 416 416 + ); 417 417 + 418 418 + let isMultiselected = useUIState((s) => s.selectedBlocks.length > 1); 419 419 + if (focusedEntity?.entityType === "page") return; 420 420 + 421 421 + if (isMultiselected) return; 422 422 + 423 423 + return ( 424 424 + <div 425 425 + className={`flex gap-1 absolute -top-[25px] right-2 pb-0.5 pt-1 px-1 rounded-t-md bg-border text-bg-page ${props.optionsClassName}`} 407 426 > 408 408 - {props.children} 427 427 + {focusedEntityType?.data.value !== "canvas" && ( 428 428 + <> 429 429 + <button 430 430 + onClick={async (e) => { 431 431 + e.stopPropagation(); 432 432 + 433 433 + if (!rep) return; 434 434 + await moveBlockDown(rep, entity_set.set); 435 435 + }} 436 436 + > 437 437 + <ArrowDownTiny /> 438 438 + </button> 439 439 + <button 440 440 + onClick={async (e) => { 441 441 + e.stopPropagation(); 442 442 + 443 443 + if (!rep) return; 444 444 + await moveBlockUp(rep); 445 445 + }} 446 446 + > 447 447 + <ArrowDownTiny className="rotate-180" /> 448 448 + </button> 449 449 + <Separator classname="border-bg-page! h-4! mx-0.5" /> 450 450 + </> 451 451 + )} 452 452 + <button 453 453 + onClick={async (e) => { 454 454 + e.stopPropagation(); 455 455 + if (!rep || !focusedEntity) return; 456 456 + 457 457 + if (props.areYouSure !== undefined && props.setAreYouSure) { 458 458 + if (!props.areYouSure) { 459 459 + props.setAreYouSure(true); 460 460 + debounced = window.setTimeout(() => { 461 461 + debounced = null; 462 462 + }, 300); 463 463 + return; 464 464 + } 465 465 + 466 466 + if (props.areYouSure) { 467 467 + if (debounced) { 468 468 + window.clearTimeout(debounced); 469 469 + debounced = window.setTimeout(() => { 470 470 + debounced = null; 471 471 + }, 300); 472 472 + return; 473 473 + } 474 474 + await deleteBlock([focusedEntity.entityID], rep); 475 475 + } 476 476 + } else { 477 477 + await deleteBlock([focusedEntity.entityID], rep); 478 478 + } 479 479 + }} 480 480 + > 481 481 + <DeleteTiny /> 482 482 + </button> 409 483 </div> 410 484 ); 411 485 };

+1 -3

components/Blocks/BlueskyPostBlock/BlueskyEmpty.tsx

··· 18 18 let isSelected = useUIState((s) => 19 19 s.selectedBlocks.find((b) => b.value === props.entityID), 20 20 ); 21 21 - let isLocked = useEntity(props.entityID, "block/is-locked")?.data.value; 22 21 23 22 let entity_set = useEntitySetContext(); 24 23 let [urlValue, setUrlValue] = useState(""); ··· 91 90 className="w-full grow border-none outline-hidden bg-transparent " 92 91 placeholder="bsky.app/post-url" 93 92 value={urlValue} 94 94 - disabled={isLocked} 95 93 onChange={(e) => setUrlValue(e.target.value)} 96 94 onKeyDown={(e) => { 97 95 if (e.key === "Enter") { ··· 109 107 <button 110 108 type="submit" 111 109 id="bluesky-post-block-submit" 112 112 - className={`p-1 ${isSelected && !isLocked ? "text-accent-contrast" : "text-border"}`} 110 110 + className={`p-1 ${isSelected ? "text-accent-contrast" : "text-border"}`} 113 111 onMouseDown={(e) => { 114 112 e.preventDefault(); 115 113 errorSmokers(e.clientX + 12, e.clientY);

+38 -15

components/Blocks/ButtonBlock.tsx

··· 24 24 let isSelected = useUIState((s) => 25 25 s.selectedBlocks.find((b) => b.value === props.entityID), 26 26 ); 27 27 + let alignment = useEntity(props.entityID, "block/text-alignment")?.data.value; 27 28 28 29 if (!url) { 29 30 if (!permissions.write) return null; ··· 31 32 } 32 33 33 34 return ( 34 34 - <a 35 35 - href={url?.data.value} 36 36 - target="_blank" 37 37 - className={`hover:outline-accent-contrast rounded-md! ${isSelected ? "block-border-selected border-0!" : "block-border border-transparent! border-0!"}`} 35 35 + <BlockLayout 36 36 + isSelected={!!isSelected} 37 37 + borderOnHover 38 38 + hasAlignment={alignment !== "justify"} 39 39 + className={`p-0! rounded-md! border-none!`} 38 40 > 39 39 - <ButtonPrimary role="link" type="submit"> 40 40 - {text?.data.value} 41 41 - </ButtonPrimary> 42 42 - </a> 41 41 + <a 42 42 + href={url?.data.value} 43 43 + target="_blank" 44 44 + className={` ${alignment === "justify" ? "w-full" : "w-fit"}`} 45 45 + > 46 46 + <ButtonPrimary 47 47 + role="link" 48 48 + type="submit" 49 49 + fullWidth={alignment === "justify"} 50 50 + > 51 51 + {text?.data.value} 52 52 + </ButtonPrimary> 53 53 + </a> 54 54 + </BlockLayout> 43 55 ); 44 56 }; 45 57 ··· 51 63 let isSelected = useUIState((s) => 52 64 s.selectedBlocks.find((b) => b.value === props.entityID), 53 65 ); 54 54 - let isLocked = useEntity(props.entityID, "block/is-locked")?.data.value; 55 66 56 67 let [textValue, setTextValue] = useState(""); 57 68 let [urlValue, setUrlValue] = useState(""); 58 69 let text = textValue; 59 70 let url = urlValue; 71 71 + let alignment = useEntity(props.entityID, "block/text-alignment")?.data.value; 60 72 61 73 let submit = async () => { 62 74 let entity = props.entityID; ··· 106 118 }; 107 119 108 120 return ( 109 109 - <div className="buttonBlockSettingsWrapper flex flex-col gap-2 w-full "> 110 110 - <ButtonPrimary className="mx-auto"> 121 121 + <div 122 122 + className={`buttonBlockSettingsWrapper flex flex-col gap-2 w-full 123 123 + `} 124 124 + > 125 125 + <ButtonPrimary 126 126 + className={`relative ${ 127 127 + alignment === "center" 128 128 + ? "place-self-center" 129 129 + : alignment === "left" 130 130 + ? "place-self-start" 131 131 + : alignment === "right" 132 132 + ? "place-self-end" 133 133 + : "place-self-center" 134 134 + }`} 135 135 + fullWidth={alignment === "justify"} 136 136 + > 111 137 {text !== "" ? text : "Button"} 112 138 </ButtonPrimary> 113 139 <BlockLayout ··· 167 193 <Separator /> 168 194 <Input 169 195 type="text" 170 170 - autoFocus 171 196 className="w-full grow border-none outline-hidden bg-transparent" 172 197 placeholder="button text" 173 198 value={textValue} 174 174 - disabled={isLocked} 175 199 onChange={(e) => setTextValue(e.target.value)} 176 200 onKeyDown={(e) => { 177 201 if ( ··· 194 218 className="w-full grow border-none outline-hidden bg-transparent" 195 219 placeholder="www.example.com" 196 220 value={urlValue} 197 197 - disabled={isLocked} 198 221 onChange={(e) => setUrlValue(e.target.value)} 199 222 onKeyDown={(e) => { 200 223 if (e.key === "Backspace" && !e.currentTarget.value) ··· 205 228 <button 206 229 id="button-block-settings" 207 230 type="submit" 208 208 - className={`p-1 shrink-0 w-fit flex gap-2 items-center place-self-end ${isSelected && !isLocked ? "text-accent-contrast" : "text-accent-contrast sm:text-border"}`} 231 231 + className={`p-1 shrink-0 w-fit flex gap-2 items-center place-self-end ${isSelected ? "text-accent-contrast" : "text-accent-contrast sm:text-border"}`} 209 232 > 210 233 <div className="sm:hidden block">Save</div> 211 234 <CheckTiny />

+57 -76

components/Blocks/CodeBlock.tsx

··· 14 14 import { flushSync } from "react-dom"; 15 15 import { elementId } from "src/utils/elementId"; 16 16 import { LAST_USED_CODE_LANGUAGE_KEY } from "src/utils/codeLanguageStorage"; 17 17 + import { focusBlock } from "src/utils/focusBlock"; 17 18 18 19 export function CodeBlock(props: BlockProps) { 19 20 let { rep, rootEntity } = useReplicache(); ··· 42 43 }, [content, lang, theme]); 43 44 44 45 const onClick = useCallback((e: React.MouseEvent<HTMLElement>) => { 45 45 - let selection = window.getSelection(); 46 46 - if (!selection || selection.rangeCount === 0) return; 47 47 - let range = selection.getRangeAt(0); 48 48 - if (!range) return; 49 49 - let length = range.toString().length; 50 50 - range.setStart(e.currentTarget, 0); 51 51 - let end = range.toString().length; 52 52 - let start = end - length; 53 53 - 54 54 - flushSync(() => { 55 55 - useUIState.getState().setSelectedBlock(props); 56 56 - useUIState.getState().setFocusedBlock({ 57 57 - entityType: "block", 58 58 - entityID: props.value, 59 59 - parent: props.parent, 60 60 - }); 61 61 - }); 62 62 - let el = document.getElementById( 63 63 - elementId.block(props.entityID).input, 64 64 - ) as HTMLTextAreaElement; 65 65 - if (!el) return; 66 66 - el.focus(); 67 67 - el.setSelectionRange(start, end); 46 46 + focusBlock( 47 47 + { parent: props.parent, value: props.value, type: "code" }, 48 48 + { type: "end" }, 49 49 + ); 68 50 }, []); 69 51 return ( 70 52 <div className="codeBlock w-full flex flex-col rounded-md gap-0.5 "> 71 71 - {permissions.write && ( 72 72 - <div className="text-sm text-tertiary flex justify-between"> 73 73 - <div className="flex gap-1"> 74 74 - Theme:{" "} 75 75 - <select 76 76 - className="codeBlockLang text-left bg-transparent pr-1 sm:max-w-none max-w-24" 77 77 - onClick={(e) => { 78 78 - e.preventDefault(); 79 79 - e.stopPropagation(); 80 80 - }} 81 81 - value={theme} 82 82 - onChange={async (e) => { 83 83 - await rep?.mutate.assertFact({ 84 84 - attribute: "theme/code-theme", 85 85 - entity: rootEntity, 86 86 - data: { type: "string", value: e.target.value }, 87 87 - }); 88 88 - }} 89 89 - > 90 90 - {bundledThemesInfo.map((t) => ( 91 91 - <option key={t.id} value={t.id}> 92 92 - {t.displayName} 93 93 - </option> 94 94 - ))} 95 95 - </select> 96 96 - </div> 97 97 - <select 98 98 - className="codeBlockLang text-right bg-transparent pr-1 sm:max-w-none max-w-24" 99 99 - onClick={(e) => { 100 100 - e.preventDefault(); 101 101 - e.stopPropagation(); 102 102 - }} 103 103 - value={lang} 104 104 - onChange={async (e) => { 105 105 - localStorage.setItem(LAST_USED_CODE_LANGUAGE_KEY, e.target.value); 106 106 - await rep?.mutate.assertFact({ 107 107 - attribute: "block/code-language", 108 108 - entity: props.entityID, 109 109 - data: { type: "string", value: e.target.value }, 110 110 - }); 111 111 - }} 112 112 - > 113 113 - <option value="plaintext">Plaintext</option> 114 114 - {bundledLanguagesInfo.map((l) => ( 115 115 - <option key={l.id} value={l.id}> 116 116 - {l.name} 117 117 - </option> 118 118 - ))} 119 119 - </select> 120 120 - </div> 121 121 - )} 122 122 - 123 53 <BlockLayout 124 54 isSelected={focusedBlock} 125 55 hasBackground="accent" 126 56 borderOnHover 127 127 - className="p-0! min-h-[48px]" 57 57 + className="p-0! min-h-10 sm:min-h-12" 128 58 > 129 59 {focusedBlock && permissions.write ? ( 130 60 <BaseTextareaBlock ··· 171 101 /> 172 102 )} 173 103 </BlockLayout> 104 104 + {permissions.write && ( 105 105 + <div className="text-sm text-tertiary flex w-full justify-between"> 106 106 + <div className="codeBlockTheme grow flex gap-1"> 107 107 + Theme:{" "} 108 108 + <select 109 109 + className="codeBlockThemeSelect text-left bg-transparent pr-1 sm:max-w-none max-w-24 w-full" 110 110 + onClick={(e) => { 111 111 + e.preventDefault(); 112 112 + e.stopPropagation(); 113 113 + }} 114 114 + value={theme} 115 115 + onChange={async (e) => { 116 116 + await rep?.mutate.assertFact({ 117 117 + attribute: "theme/code-theme", 118 118 + entity: rootEntity, 119 119 + data: { type: "string", value: e.target.value }, 120 120 + }); 121 121 + }} 122 122 + > 123 123 + {bundledThemesInfo.map((t) => ( 124 124 + <option key={t.id} value={t.id}> 125 125 + {t.displayName} 126 126 + </option> 127 127 + ))} 128 128 + </select> 129 129 + </div> 130 130 + <select 131 131 + className="codeBlockLang grow text-right bg-transparent pr-1 sm:max-w-none max-w-24 w-full" 132 132 + onClick={(e) => { 133 133 + e.preventDefault(); 134 134 + e.stopPropagation(); 135 135 + }} 136 136 + value={lang} 137 137 + onChange={async (e) => { 138 138 + localStorage.setItem(LAST_USED_CODE_LANGUAGE_KEY, e.target.value); 139 139 + await rep?.mutate.assertFact({ 140 140 + attribute: "block/code-language", 141 141 + entity: props.entityID, 142 142 + data: { type: "string", value: e.target.value }, 143 143 + }); 144 144 + }} 145 145 + > 146 146 + <option value="plaintext">Plaintext</option> 147 147 + {bundledLanguagesInfo.map((l) => ( 148 148 + <option key={l.id} value={l.id}> 149 149 + {l.name} 150 150 + </option> 151 151 + ))} 152 152 + </select> 153 153 + </div> 154 154 + )} 174 155 </div> 175 156 ); 176 157 }

+2 -3

components/Blocks/DateTimeBlock.tsx

··· 53 53 s.selectedBlocks.find((b) => b.value === props.entityID), 54 54 ); 55 55 56 56 - let isLocked = !!useEntity(props.entityID, "block/is-locked")?.data.value; 57 56 let alignment = useEntity(props.entityID, "block/text-alignment")?.data.value; 58 57 59 58 const handleTimeChange: React.ChangeEventHandler<HTMLInputElement> = (e) => { ··· 117 116 118 117 return ( 119 118 <Popover 120 120 - disabled={isLocked || !permissions.write} 119 119 + disabled={!permissions.write} 121 120 className="w-64 z-10 px-2!" 122 121 trigger={ 123 122 <BlockLayout ··· 133 132 {dateFact ? ( 134 133 <div 135 134 className={`font-bold 136 136 - ${!permissions.write || isLocked ? "" : "group-hover/date:underline"} 135 135 + ${!permissions.write ? "" : "group-hover/date:underline"} 137 136 `} 138 137 > 139 138 {selectedDate.toLocaleDateString(undefined, {

+4 -4

components/Blocks/EmbedBlock.tsx

··· 111 111 <div 112 112 data-draggable 113 113 className={`resizeHandle 114 114 + 115 115 + 114 116 cursor-ns-resize shrink-0 z-10 w-6 h-[5px] 115 115 - absolute bottom-2 right-1/2 translate-x-1/2 translate-y-[2px] 117 117 + absolute bottom-[3px] right-1/2 translate-x-1/2 116 118 rounded-full bg-white border-2 border-[#8C8C8C] shadow-[0_0_0_1px_white,inset_0_0_0_1px_white] 117 119 ${isCanvasBlock ? "hidden group-hover/canvas-block:block" : ""}`} 118 120 {...heightHandle.handlers} ··· 129 131 let isSelected = useUIState((s) => 130 132 s.selectedBlocks.find((b) => b.value === props.entityID), 131 133 ); 132 132 - let isLocked = useEntity(props.entityID, "block/is-locked")?.data.value; 133 134 134 135 let entity_set = useEntitySetContext(); 135 136 let [linkValue, setLinkValue] = useState(""); ··· 250 251 className="w-full grow border-none outline-hidden bg-transparent " 251 252 placeholder="www.example.com" 252 253 value={linkValue} 253 253 - disabled={isLocked} 254 254 onChange={(e) => setLinkValue(e.target.value)} 255 255 /> 256 256 <button 257 257 type="submit" 258 258 id="embed-block-submit" 259 259 disabled={loading} 260 260 - className={`p-1 ${isSelected && !isLocked ? "text-accent-contrast" : "text-border"}`} 260 260 + className={`p-1 ${isSelected ? "text-accent-contrast" : "text-border"}`} 261 261 onMouseDown={(e) => { 262 262 e.preventDefault(); 263 263 if (loading) return;

+1 -3

components/Blocks/ExternalLinkBlock.tsx

··· 118 118 let isSelected = useUIState((s) => 119 119 s.selectedBlocks.find((b) => b.value === props.entityID), 120 120 ); 121 121 - let isLocked = useEntity(props.value, "block/is-locked")?.data.value; 122 121 let entity_set = useEntitySetContext(); 123 122 let [linkValue, setLinkValue] = useState(""); 124 123 let { rep } = useReplicache(); ··· 173 172 !props.preview ? elementId.block(props.entityID).input : undefined 174 173 } 175 174 type="url" 176 176 - disabled={isLocked} 177 175 className="w-full grow border-none outline-hidden bg-transparent " 178 176 placeholder="www.example.com" 179 177 value={linkValue} ··· 199 197 <div className="flex items-center gap-3 "> 200 198 <button 201 199 autoFocus={false} 202 202 - className={`p-1 ${isSelected && !isLocked ? "text-accent-contrast" : "text-border"}`} 200 200 + className={`p-1 ${isSelected ? "text-accent-contrast" : "text-border"}`} 203 201 onMouseDown={(e) => { 204 202 e.preventDefault(); 205 203 if (!linkValue || linkValue === "") {

+43 -34

components/Blocks/ImageBlock.tsx

··· 19 19 import { ImageAltSmall } from "components/Icons/ImageAlt"; 20 20 import { useLeafletPublicationData } from "components/PageSWRDataProvider"; 21 21 import { useSubscribe } from "src/replicache/useSubscribe"; 22 22 - import { ImageCoverImage } from "components/Icons/ImageCoverImage"; 22 22 + import { 23 23 + ImageCoverImage, 24 24 + ImageCoverImageRemove, 25 25 + } from "components/Icons/ImageCoverImage"; 26 26 + import { 27 27 + ButtonPrimary, 28 28 + ButtonSecondary, 29 29 + ButtonTertiary, 30 30 + } from "components/Buttons"; 31 31 + import { CheckTiny } from "components/Icons/CheckTiny"; 23 32 24 33 export function ImageBlock(props: BlockProps & { preview?: boolean }) { 25 34 let { rep } = useReplicache(); ··· 28 37 let isSelected = useUIState((s) => 29 38 s.selectedBlocks.find((b) => b.value === props.value), 30 39 ); 31 31 - let isLocked = useEntity(props.value, "block/is-locked")?.data.value; 32 40 let isFullBleed = useEntity(props.value, "image/full-bleed")?.data.value; 33 41 let isFirst = props.previousBlock === null; 34 42 let isLast = props.nextBlock === null; ··· 84 92 return ( 85 93 <BlockLayout 86 94 hasBackground="accent" 87 87 - isSelected={!!isSelected && !isLocked} 95 95 + isSelected={!!isSelected} 88 96 borderOnHover 89 97 className=" group/image-block text-tertiary hover:text-accent-contrast hover:font-bold h-[104px] border-dashed rounded-lg" 90 98 > 91 99 <label 92 100 className={` 93 93 - 94 101 w-full h-full hover:cursor-pointer 95 102 flex flex-col items-center justify-center 96 96 - ${props.pageType === "canvas" && "bg-bg-page"}`} 103 103 + `} 97 104 onMouseDown={(e) => e.preventDefault()} 98 105 onDragOver={(e) => { 99 106 e.preventDefault(); ··· 102 109 onDrop={async (e) => { 103 110 e.preventDefault(); 104 111 e.stopPropagation(); 105 105 - if (isLocked) return; 106 112 const files = e.dataTransfer.files; 107 113 if (files && files.length > 0) { 108 114 const file = files[0]; ··· 119 125 Upload An Image 120 126 </div> 121 127 <input 122 122 - disabled={isLocked} 123 128 className="h-0 w-0 hidden" 124 129 type="file" 125 130 accept="image/*" ··· 134 139 ); 135 140 } 136 141 137 137 - let imageClassName = isFullBleed 138 138 - ? "" 139 139 - : isSelected 140 140 - ? "block-border-selected border-transparent! " 141 141 - : "block-border border-transparent!"; 142 142 - 143 142 let isLocalUpload = localImages.get(image.data.src); 144 143 145 144 let blockClassName = ` 146 145 relative group/image border-transparent! p-0! w-fit! 147 147 - ${isFullBleed && "-mx-3 sm:-mx-4"} 146 146 + ${isFullBleed && "-mx-[14px] sm:-mx-[18px] rounded-[0px]! sm:outline-offset-[-16px]! -outline-offset[-12px]!"} 148 147 ${isFullBleed ? (isFirst ? "-mt-3 sm:-mt-4" : prevIsFullBleed ? "-mt-1" : "") : ""} 149 148 ${isFullBleed ? (isLast ? "-mb-4" : nextIsFullBleed ? "-mb-2" : "") : ""} 150 149 `; 151 150 152 151 return ( 153 153 - <BlockLayout isSelected={!!isSelected} className={blockClassName}> 152 152 + <BlockLayout 153 153 + hasAlignment 154 154 + isSelected={!!isSelected} 155 155 + className={blockClassName} 156 156 + optionsClassName={isFullBleed ? "top-[-8px]!" : ""} 157 157 + > 154 158 {isLocalUpload || image.data.local ? ( 155 159 <img 156 160 loading="lazy" ··· 168 172 } 169 173 height={image?.data.height} 170 174 width={image?.data.width} 171 171 - className={imageClassName} 172 175 /> 173 176 )} 174 177 {altText !== undefined && !props.preview ? ( ··· 204 207 ); 205 208 206 209 // Only show if focused, in a publication, has write permissions, and no cover image is set 207 207 - if ( 208 208 - !isFocused || 209 209 - !pubData?.publications || 210 210 - !entity_set.permissions.write || 211 211 - coverImage 212 212 - ) 210 210 + if (!isFocused || !pubData?.publications || !entity_set.permissions.write) 213 211 return null; 214 214 - 215 215 - return ( 216 216 - <div className="absolute top-2 left-2"> 217 217 - <button 218 218 - className="flex items-center gap-1 text-xs bg-bg-page/80 hover:bg-bg-page text-secondary hover:text-primary px-2 py-1 rounded-md border border-border hover:border-primary transition-colors" 212 212 + if (coverImage) 213 213 + return ( 214 214 + <ButtonSecondary 215 215 + className="absolute top-2 right-2" 219 216 onClick={async (e) => { 220 217 e.preventDefault(); 221 218 e.stopPropagation(); 222 219 await rep?.mutate.updatePublicationDraft({ 223 223 - cover_image: props.entityID, 220 220 + cover_image: null, 224 221 }); 225 222 }} 226 223 > 227 227 - <span className="w-4 h-4 flex items-center justify-center"> 228 228 - <ImageCoverImage /> 229 229 - </span> 230 230 - Set as Cover 231 231 - </button> 232 232 - </div> 224 224 + Remove Cover Image 225 225 + <ImageCoverImageRemove /> 226 226 + </ButtonSecondary> 227 227 + ); 228 228 + return ( 229 229 + <ButtonPrimary 230 230 + className="absolute top-2 right-2" 231 231 + onClick={async (e) => { 232 232 + e.preventDefault(); 233 233 + e.stopPropagation(); 234 234 + await rep?.mutate.updatePublicationDraft({ 235 235 + cover_image: props.entityID, 236 236 + }); 237 237 + }} 238 238 + > 239 239 + Use as Cover Image 240 240 + <ImageCoverImage /> 241 241 + </ButtonPrimary> 233 242 ); 234 243 }; 235 244

+18 -3

components/Blocks/MailboxBlock.tsx

··· 26 26 import { ArrowDownTiny } from "components/Icons/ArrowDownTiny"; 27 27 import { InfoSmall } from "components/Icons/InfoSmall"; 28 28 29 29 - export const MailboxBlock = (props: BlockProps) => { 29 29 + export const MailboxBlock = ( 30 30 + props: BlockProps & { 31 31 + areYouSure?: boolean; 32 32 + setAreYouSure?: (value: boolean) => void; 33 33 + }, 34 34 + ) => { 30 35 let isSubscribed = useSubscriptionStatus(props.entityID); 31 36 let isSelected = useUIState((s) => 32 37 s.selectedBlocks.find((b) => b.value === props.entityID), ··· 41 46 let subscriber_count = useEntity(props.entityID, "mailbox/subscriber-count"); 42 47 if (!permission) 43 48 return ( 44 44 - <MailboxReaderView entityID={props.entityID} parent={props.parent} /> 49 49 + <MailboxReaderView 50 50 + entityID={props.entityID} 51 51 + parent={props.parent} 52 52 + /> 45 53 ); 46 54 47 55 return ( ··· 49 57 <BlockLayout 50 58 isSelected={!!isSelected} 51 59 hasBackground={"accent"} 60 60 + areYouSure={props.areYouSure} 61 61 + setAreYouSure={props.setAreYouSure} 52 62 className="flex gap-2 items-center justify-center" 53 63 > 54 64 <ButtonPrimary ··· 120 130 ); 121 131 }; 122 132 123 123 - const MailboxReaderView = (props: { entityID: string; parent: string }) => { 133 133 + const MailboxReaderView = (props: { 134 134 + entityID: string; 135 135 + parent: string; 136 136 + 137 137 + }) => { 124 138 let isSubscribed = useSubscriptionStatus(props.entityID); 125 139 let isSelected = useUIState((s) => 126 140 s.selectedBlocks.find((b) => b.value === props.entityID), ··· 133 147 <BlockLayout 134 148 isSelected={!!isSelected} 135 149 hasBackground={"accent"} 150 150 + 136 151 className="`h-full flex flex-col gap-2 items-center justify-center" 137 152 > 138 153 {!isSubscribed?.confirmed ? (

+9 -1

components/Blocks/PageLinkBlock.tsx

··· 13 13 import { CardThemeProvider } from "components/ThemeManager/ThemeProvider"; 14 14 import { useCardBorderHidden } from "components/Pages/useCardBorderHidden"; 15 15 16 16 - export function PageLinkBlock(props: BlockProps & { preview?: boolean }) { 16 16 + export function PageLinkBlock( 17 17 + props: BlockProps & { 18 18 + preview?: boolean; 19 19 + areYouSure?: boolean; 20 20 + setAreYouSure?: (value: boolean) => void; 21 21 + }, 22 22 + ) { 17 23 let page = useEntity(props.entityID, "block/card"); 18 24 let type = 19 25 useEntity(page?.data.value || null, "page/type")?.data.value || "doc"; ··· 32 38 <BlockLayout 33 39 hasBackground="page" 34 40 isSelected={!!isSelected} 41 41 + areYouSure={props.areYouSure} 42 42 + setAreYouSure={props.setAreYouSure} 35 43 className={`cursor-pointer 36 44 pageLinkBlockWrapper relative group/pageLinkBlock 37 45 flex overflow-clip p-0!

+14 -2

components/Blocks/PollBlock/index.tsx

··· 20 20 import { PublicationPollBlock } from "../PublicationPollBlock"; 21 21 import { usePollBlockUIState } from "./pollBlockState"; 22 22 23 23 - export const PollBlock = (props: BlockProps) => { 23 23 + export const PollBlock = ( 24 24 + props: BlockProps & { 25 25 + areYouSure?: boolean; 26 26 + setAreYouSure?: (value: boolean) => void; 27 27 + }, 28 28 + ) => { 24 29 let { data: pub } = useLeafletPublicationData(); 25 30 if (!pub) return <LeafletPollBlock {...props} />; 26 31 return <PublicationPollBlock {...props} />; 27 32 }; 28 33 29 29 - export const LeafletPollBlock = (props: BlockProps) => { 34 34 + export const LeafletPollBlock = ( 35 35 + props: BlockProps & { 36 36 + areYouSure?: boolean; 37 37 + setAreYouSure?: (value: boolean) => void; 38 38 + }, 39 39 + ) => { 30 40 let isSelected = useUIState((s) => 31 41 s.selectedBlocks.find((b) => b.value === props.entityID), 32 42 ); ··· 64 74 <BlockLayout 65 75 isSelected={!!isSelected} 66 76 hasBackground={"accent"} 77 77 + areYouSure={props.areYouSure} 78 78 + setAreYouSure={props.setAreYouSure} 67 79 className="poll flex flex-col gap-2 w-full" 68 80 > 69 81 {pollState === "editing" ? (

+9 -2

components/Blocks/PublicationPollBlock.tsx

··· 21 21 * It allows adding/editing options when the poll hasn't been published yet, 22 22 * but disables adding new options once the poll record exists (indicated by pollUri). 23 23 */ 24 24 - export const PublicationPollBlock = (props: BlockProps) => { 25 25 - let { data: publicationData, normalizedDocument } = useLeafletPublicationData(); 24 24 + export const PublicationPollBlock = ( 25 25 + props: BlockProps & { 26 26 + areYouSure?: boolean; 27 27 + setAreYouSure?: (value: boolean) => void; 28 28 + }, 29 29 + ) => { 30 30 + let { data: publicationData } = useLeafletPublicationData(); 26 31 let isSelected = useUIState((s) => 27 32 s.selectedBlocks.find((b) => b.value === props.entityID), 28 33 ); ··· 57 62 className="poll flex flex-col gap-2" 58 63 hasBackground={"accent"} 59 64 isSelected={!!isSelected} 65 65 + areYouSure={props.areYouSure} 66 66 + setAreYouSure={props.setAreYouSure} 60 67 > 61 68 <EditPollForPublication 62 69 entityID={props.entityID}

+8 -1

components/Blocks/RSVPBlock/index.tsx

··· 24 24 } 25 25 | { state: "contact_details"; status: RSVP_Status }; 26 26 27 27 - export function RSVPBlock(props: BlockProps) { 27 27 + export function RSVPBlock( 28 28 + props: BlockProps & { 29 29 + areYouSure?: boolean; 30 30 + setAreYouSure?: (value: boolean) => void; 31 31 + }, 32 32 + ) { 28 33 let isSelected = useUIState((s) => 29 34 s.selectedBlocks.find((b) => b.value === props.entityID), 30 35 ); ··· 32 37 <BlockLayout 33 38 isSelected={!!isSelected} 34 39 hasBackground={"accent"} 40 40 + areYouSure={props.areYouSure} 41 41 + setAreYouSure={props.setAreYouSure} 35 42 className="rsvp relative flex flex-col gap-1 w-full rounded-lg place-items-center justify-center" 36 43 > 37 44 <RSVPForm entityID={props.entityID} />

+2 -8

components/Blocks/TextBlock/index.tsx

··· 41 41 preview?: boolean; 42 42 }, 43 43 ) { 44 44 - let isLocked = useEntity(props.entityID, "block/is-locked"); 45 44 let initialized = useHasPageLoaded(); 46 45 let first = props.previousBlock === null; 47 46 let permission = useEntitySetContext().permissions.write; 48 47 49 48 return ( 50 49 <> 51 51 - {(!initialized || 52 52 - !permission || 53 53 - props.preview || 54 54 - isLocked?.data.value) && ( 50 50 + {(!initialized || !permission || props.preview) && ( 55 51 <RenderedTextBlock 56 52 type={props.type} 57 53 entityID={props.entityID} ··· 61 57 previousBlock={props.previousBlock} 62 58 /> 63 59 )} 64 64 - {permission && !props.preview && !isLocked?.data.value && ( 60 60 + {permission && !props.preview && ( 65 61 <div 66 62 className={`w-full relative group ${!initialized ? "hidden" : ""}`} 67 63 > ··· 330 326 let { editorState } = props; 331 327 let rep = useReplicache(); 332 328 let smoker = useSmoker(); 333 333 - let isLocked = useEntity(props.entityID, "block/is-locked"); 334 329 let focused = useUIState((s) => s.focusedEntity?.entityID === props.entityID); 335 330 336 331 let isBlueskyPost = ··· 340 335 // if its bluesky, change text to embed post 341 336 342 337 if ( 343 343 - !isLocked && 344 338 focused && 345 339 editorState && 346 340 betterIsUrl(editorState.doc.textContent) &&

+1 -3

components/Blocks/index.tsx

··· 181 181 : null, 182 182 ); 183 183 184 184 - let isLocked = useEntity(props.lastBlock?.value || null, "block/is-locked"); 185 184 if (!entity_set.permissions.write) return null; 186 185 if ( 187 187 - ((props.lastBlock?.type === "text" && !isLocked?.data.value) || 188 188 - props.lastBlock?.type === "heading") && 186 186 + (props.lastBlock?.type === "text" || props.lastBlock?.type === "heading") && 189 187 (!editorState?.editor || editorState.editor.doc.content.size <= 2) 190 188 ) 191 189 return null;

+5 -15

components/Blocks/useBlockKeyboardHandlers.ts

··· 23 23 ) { 24 24 let { rep, undoManager } = useReplicache(); 25 25 let entity_set = useEntitySetContext(); 26 26 - let isLocked = !!useEntity(props.entityID, "block/is-locked")?.data.value; 27 26 28 27 let isSelected = useUIState((s) => { 29 28 let selectedBlocks = s.selectedBlocks; ··· 70 69 entity_set, 71 70 areYouSure, 72 71 setAreYouSure, 73 73 - isLocked, 74 72 }); 75 73 undoManager.endGroup(); 76 74 }; 77 75 window.addEventListener("keydown", listener); 78 76 return () => window.removeEventListener("keydown", listener); 79 79 - }, [entity_set, isSelected, props, rep, areYouSure, setAreYouSure, isLocked]); 77 77 + }, [entity_set, isSelected, props, rep, areYouSure, setAreYouSure]); 80 78 } 81 79 82 80 type Args = { 83 81 e: KeyboardEvent; 84 84 - isLocked: boolean; 85 82 props: BlockProps; 86 83 rep: Replicache<ReplicacheMutators>; 87 84 entity_set: { set: string }; ··· 133 130 } 134 131 135 132 let debounced: null | number = null; 136 136 - async function Backspace({ 137 137 - e, 138 138 - props, 139 139 - rep, 140 140 - areYouSure, 141 141 - setAreYouSure, 142 142 - isLocked, 143 143 - }: Args) { 133 133 + async function Backspace({ e, props, rep, areYouSure, setAreYouSure }: Args) { 144 134 // if this is a textBlock, let the textBlock/keymap handle the backspace 145 145 - if (isLocked) return; 146 135 // if its an input, label, or teatarea with content, do nothing (do the broswer default instead) 147 136 let el = e.target as HTMLElement; 148 137 if ( ··· 154 143 if ((el as HTMLInputElement).value !== "") return; 155 144 } 156 145 157 157 - // if the block is a card or mailbox... 146 146 + // if the block is a card, mailbox, rsvp, or poll... 158 147 if ( 159 148 props.type === "card" || 160 149 props.type === "mailbox" || 161 161 - props.type === "rsvp" 150 150 + props.type === "rsvp" || 151 151 + props.type === "poll" 162 152 ) { 163 153 // ...and areYouSure state is false, set it to true 164 154 if (!areYouSure) {

+21 -3

components/Blocks/useBlockMouseHandlers.ts

··· 1 1 import { useSelectingMouse } from "components/SelectionManager/selectionState"; 2 2 - import { MouseEvent, useCallback, useRef } from "react"; 2 2 + import { MouseEvent, useCallback } from "react"; 3 3 import { useUIState } from "src/useUIState"; 4 4 import { Block } from "./Block"; 5 5 import { isTextBlock } from "src/utils/isTextBlock"; ··· 12 12 import { elementId } from "src/utils/elementId"; 13 13 14 14 let debounce: number | null = null; 15 15 + 16 16 + // Track scrolling state for mobile 17 17 + let isScrolling = false; 18 18 + let scrollTimeout: number | null = null; 19 19 + 20 20 + if (typeof window !== "undefined") { 21 21 + window.addEventListener( 22 22 + "scroll", 23 23 + () => { 24 24 + isScrolling = true; 25 25 + if (scrollTimeout) window.clearTimeout(scrollTimeout); 26 26 + scrollTimeout = window.setTimeout(() => { 27 27 + isScrolling = false; 28 28 + }, 150); 29 29 + }, 30 30 + true, 31 31 + ); 32 32 + } 15 33 export function useBlockMouseHandlers(props: Block) { 16 34 let entity_set = useEntitySetContext(); 17 35 let isMobile = useIsMobile(); ··· 22 40 if ((e.target as Element).tagName === "BUTTON") return; 23 41 if ((e.target as Element).tagName === "SELECT") return; 24 42 if ((e.target as Element).tagName === "OPTION") return; 25 25 - if (isMobile) return; 43 43 + if (isMobile && isScrolling) return; 26 44 if (!entity_set.permissions.write) return; 27 45 useSelectingMouse.setState({ start: props.value }); 28 46 if (e.shiftKey) { ··· 57 75 ); 58 76 let onMouseEnter = useCallback( 59 77 async (e: MouseEvent) => { 60 60 - if (isMobile) return; 78 78 + if (isMobile && isScrolling) return; 61 79 if (!entity_set.permissions.write) return; 62 80 if (debounce) window.clearTimeout(debounce); 63 81 debounce = window.setTimeout(async () => {

+47 -34

components/Canvas.tsx

··· 22 22 import { PublicationMetadata } from "./Pages/PublicationMetadata"; 23 23 import { useLeafletPublicationData } from "./PageSWRDataProvider"; 24 24 import { useHandleCanvasDrop } from "./Blocks/useHandleCanvasDrop"; 25 25 + import { useBlockMouseHandlers } from "./Blocks/useBlockMouseHandlers"; 25 26 26 27 export function Canvas(props: { 27 28 entityID: string; ··· 286 287 }, 287 288 [props, rep, permissions], 288 289 ); 289 289 - let { dragDelta, handlers } = useDrag({ 290 290 + let { dragDelta, handlers: dragHandlers } = useDrag({ 290 291 onDragEnd, 291 291 - delay: isMobile, 292 292 }); 293 293 294 294 let widthOnDragEnd = useCallback( ··· 335 335 ); 336 336 let rotateHandle = useDrag({ onDragEnd: RotateOnDragEnd }); 337 337 338 338 - let { isLongPress, handlers: longPressHandlers } = useLongPress(() => { 339 339 - if (isLongPress.current && permissions.write) { 340 340 - focusBlock( 341 341 - { 342 342 - type: type?.data.value || "text", 343 343 - value: props.entityID, 344 344 - parent: props.parent, 345 345 - }, 346 346 - { type: "start" }, 347 347 - ); 348 348 - } 349 349 - }); 338 338 + let { isLongPress, longPressHandlers: longPressHandlers } = useLongPress( 339 339 + () => { 340 340 + if (isLongPress.current && permissions.write) { 341 341 + focusBlock( 342 342 + { 343 343 + type: type?.data.value || "text", 344 344 + value: props.entityID, 345 345 + parent: props.parent, 346 346 + }, 347 347 + { type: "start" }, 348 348 + ); 349 349 + } 350 350 + }, 351 351 + ); 350 352 let angle = 0; 351 353 if (rotateHandle.dragDelta) { 352 354 let originX = rect.x + rect.width / 2; ··· 383 385 }; 384 386 }, [props, type?.data.value]); 385 387 useBlockKeyboardHandlers(blockProps, areYouSure, setAreYouSure); 388 388 + let mouseHandlers = useBlockMouseHandlers(blockProps); 389 389 + 386 390 let isList = useEntity(props.entityID, "block/is-list"); 387 391 let isFocused = useUIState( 388 392 (s) => s.focusedEntity?.entityID === props.entityID, ··· 391 395 return ( 392 396 <div 393 397 ref={ref} 394 394 - {...(!props.preview ? { ...longPressHandlers } : {})} 395 395 - {...(isMobile && permissions.write ? { ...handlers } : {})} 398 398 + {...(!props.preview ? { ...longPressHandlers, ...mouseHandlers } : {})} 396 399 id={props.preview ? undefined : elementId.block(props.entityID).container} 397 397 - className={`absolute group/canvas-block will-change-transform rounded-lg flex items-stretch origin-center p-3 `} 400 400 + className={`canvasBlockWrapper absolute group/canvas-block will-change-transform rounded-lg flex items-stretch origin-center p-3 `} 398 401 style={{ 399 402 top: 0, 400 403 left: 0, ··· 403 406 transform, 404 407 }} 405 408 > 406 406 - {/* the gripper show on hover, but longpress logic needs to be added for mobile*/} 407 407 - {!props.preview && permissions.write && <Gripper {...handlers} />} 409 409 + {!props.preview && permissions.write && ( 410 410 + <Gripper isFocused={isFocused} {...dragHandlers} /> 411 411 + )} 412 412 + 408 413 <div 409 409 - className={`contents ${dragDelta || widthHandle.dragDelta || rotateHandle.dragDelta ? "pointer-events-none" : ""} `} 414 414 + className={` w-full ${dragDelta || widthHandle.dragDelta || rotateHandle.dragDelta ? "pointer-events-none" : ""} `} 410 415 > 411 416 <BaseBlock 412 417 {...blockProps} ··· 424 429 <div 425 430 className={`resizeHandle 426 431 cursor-e-resize shrink-0 z-10 427 427 - hidden group-hover/canvas-block:block 428 428 - w-[5px] h-6 -ml-[3px] 429 429 - absolute top-1/2 right-3 -translate-y-1/2 translate-x-[2px] 430 430 - rounded-full bg-white border-2 border-[#8C8C8C] shadow-[0_0_0_1px_white,inset_0_0_0_1px_white]`} 432 432 + group-hover/canvas-block:block 433 433 + sm:w-[5px] w-3 sm:h-6 h-8 434 434 + absolute top-1/2 sm:right-2 right-1 -translate-y-1/2 435 435 + rounded-full bg-white border-2 border-[#8C8C8C] shadow-[0_0_0_1px_white,inset_0_0_0_1px_white] 436 436 + ${isFocused ? "block" : "hidden"} 437 437 + 438 438 + `} 431 439 {...widthHandle.handlers} 432 440 /> 433 441 )} ··· 436 444 <div 437 445 className={`rotateHandle 438 446 cursor-grab shrink-0 z-10 439 439 - hidden group-hover/canvas-block:block 440 440 - w-[8px] h-[8px] 441 441 - absolute bottom-0 -right-0 447 447 + group-hover/canvas-block:block 448 448 + sm:w-[8px] sm:h-[8px] w-4 h-4 449 449 + absolute sm:bottom-0 sm:right-0 -bottom-1 -right-1 442 450 -translate-y-1/2 -translate-x-1/2 443 443 - rounded-full bg-white border-2 border-[#8C8C8C] shadow-[0_0_0_1px_white,inset_0_0_0_1px_white]`} 451 451 + rounded-full bg-white border-2 border-[#8C8C8C] shadow-[0_0_0_1px_white,inset_0_0_0_1px_white] 452 452 + ${isFocused ? "block" : "hidden"} 453 453 + `} 444 454 {...rotateHandle.handlers} 445 455 /> 446 456 )} ··· 561 571 } 562 572 }; 563 573 564 564 - const Gripper = (props: { onMouseDown: (e: React.MouseEvent) => void }) => { 574 574 + const Gripper = (props: { 575 575 + onMouseDown: (e: React.MouseEvent) => void; 576 576 + isFocused: boolean; 577 577 + }) => { 565 578 return ( 566 579 <div 567 580 onMouseDown={props.onMouseDown} 568 581 onPointerDown={props.onMouseDown} 569 569 - className="w-[9px] shrink-0 py-1 mr-1 bg-bg-card cursor-grab touch-none" 582 582 + className="gripper w-[9px] shrink-0 py-1 mr-1 cursor-grab touch-none" 570 583 > 571 571 - <Media mobile={false} className="h-full grid grid-cols-1 grid-rows-1 "> 584 584 + <div className="h-full grid grid-cols-1 grid-rows-1 "> 572 585 {/* the gripper is two svg's stacked on top of each other. 573 586 One for the actual gripper, the other is an outline to endure the gripper stays visible on image backgrounds */} 574 587 <div 575 575 - className="h-full col-start-1 col-end-2 row-start-1 row-end-2 bg-bg-page hidden group-hover/canvas-block:block" 588 588 + className={`h-full col-start-1 col-end-2 row-start-1 row-end-2 bg-bg-page group-hover/canvas-block:block ${props.isFocused ? "block" : "hidden"}`} 576 589 style={{ maskImage: "var(--gripperSVG2)", maskRepeat: "repeat" }} 577 590 /> 578 591 <div 579 579 - className="h-full col-start-1 col-end-2 row-start-1 row-end-2 bg-tertiary hidden group-hover/canvas-block:block" 592 592 + className={`h-full col-start-1 col-end-2 row-start-1 row-end-2 bg-tertiary group-hover/canvas-block:block ${props.isFocused ? "block" : "hidden"}`} 580 593 style={{ maskImage: "var(--gripperSVG)", maskRepeat: "repeat" }} 581 594 /> 582 582 - </Media> 595 595 + </div> 583 596 </div> 584 597 ); 585 598 };

+7

components/DesktopFooter.tsx

··· 4 4 import { Toolbar } from "./Toolbar"; 5 5 import { useEntitySetContext } from "./EntitySetProvider"; 6 6 import { focusBlock } from "src/utils/focusBlock"; 7 7 + import { hasBlockToolbar } from "app/[leaflet_id]/Footer"; 8 8 + import { useEntity } from "src/replicache"; 7 9 8 10 export function DesktopPageFooter(props: { pageID: string }) { 9 11 let focusedEntity = useUIState((s) => s.focusedEntity); ··· 13 15 : focusedEntity?.parent; 14 16 let entity_set = useEntitySetContext(); 15 17 18 18 + let blockType = useEntity(focusedEntity?.entityID || null, "block/type")?.data 19 19 + .value; 20 20 + 16 21 return ( 17 22 <Media 18 23 mobile={false} ··· 20 25 > 21 26 {focusedEntity && 22 27 focusedEntity.entityType === "block" && 28 28 + hasBlockToolbar(blockType) && 23 29 entity_set.permissions.write && 24 30 focusedBlockParentID === props.pageID && ( 25 31 <div ··· 29 35 }} 30 36 > 31 37 <Toolbar 38 38 + blockType={blockType} 32 39 pageID={focusedBlockParentID} 33 40 blockID={focusedEntity.entityID} 34 41 />

+19

components/Icons/DeleteTiny.tsx

··· 1 1 + import { Props } from "./Props"; 2 2 + 3 3 + export const DeleteTiny = (props: Props) => { 4 4 + return ( 5 5 + <svg 6 6 + width="16" 7 7 + height="16" 8 8 + viewBox="0 0 16 16" 9 9 + fill="none" 10 10 + xmlns="http://www.w3.org/2000/svg" 11 11 + {...props} 12 12 + > 13 13 + <path 14 14 + d="M4.84013 0.946324C5.45222 0.762486 6.19573 0.729124 6.97782 0.820347C7.32039 0.860495 7.56546 1.1711 7.52568 1.51371C7.48568 1.85656 7.17517 2.10252 6.83232 2.06253C6.16005 1.98415 5.5998 2.02378 5.20048 2.14359C4.79524 2.26531 4.64378 2.43772 4.59599 2.56351C4.34149 3.23723 5.58865 4.19255 6.08232 4.51761C6.54562 4.82266 7.09489 5.10483 7.70536 5.33597C8.80491 5.75229 9.85164 5.90795 10.6409 5.84769C11.4848 5.78311 11.8008 5.50429 11.8714 5.31839C11.9189 5.19263 11.9202 4.96386 11.6976 4.60453C11.478 4.25029 11.0842 3.84861 10.5286 3.46195C10.2455 3.26479 10.1754 2.87508 10.3724 2.59183C10.5696 2.30876 10.9592 2.23946 11.2425 2.43656C11.8885 2.88612 12.4235 3.40237 12.7601 3.94535C13.0932 4.48275 13.2786 5.13116 13.0403 5.76078C12.9083 6.10935 12.6779 6.37566 12.3909 6.57621C12.366 6.82447 12.311 7.37448 12.2425 8.01957C12.1491 8.89816 12.0306 9.96291 11.9329 10.6856C11.809 11.602 11.638 12.5144 11.4153 13.4121C11.237 14.0305 10.6957 14.4725 10.0989 14.75C9.43935 15.0567 8.58506 15.2285 7.63212 15.2285C5.83513 15.2285 4.30017 14.7464 3.83818 13.3604C3.76287 13.0881 3.70695 12.8096 3.6497 12.5332C3.55128 12.058 3.42826 11.4025 3.33134 10.6856C3.23301 9.95806 3.11264 8.74578 3.01689 7.72562C2.96878 7.21315 2.92679 6.74483 2.89677 6.40531C2.87398 6.14754 2.83052 5.88349 2.86454 5.62503C2.95213 4.95974 3.29709 4.69093 3.98271 4.32035C3.46821 3.68093 3.13499 2.89278 3.42704 2.12113C3.66559 1.49131 4.23434 1.12831 4.84013 0.946324ZM4.26103 7.60843C4.35712 8.63219 4.47618 9.82018 4.5706 10.5186C4.66257 11.1989 4.7799 11.8245 4.87431 12.2803C4.92135 12.5074 4.9622 12.6916 4.9915 12.8184C5.24073 13.8967 6.74216 13.9785 7.63212 13.9785C8.44689 13.9785 9.11364 13.8297 9.57255 13.6162C9.98848 13.4227 10.1815 13.2132 10.2727 12.8184C10.3608 12.4373 10.5558 11.538 10.6936 10.5186C10.7887 9.81541 10.9059 8.76587 10.9993 7.88675C11.027 7.62595 11.0512 7.38071 11.0735 7.16507C10.278 7.59273 9.18805 7.88086 7.96318 7.88089C7.26324 7.88089 6.60019 7.80834 6.0081 7.67875C5.37465 7.54007 4.79262 7.29359 4.20732 7.02347C4.22408 7.20782 4.24189 7.4046 4.26103 7.60843ZM5.65849 9.89847C5.93369 9.87744 6.17434 10.0843 6.1956 10.3594C6.21921 10.6683 6.24342 10.9585 6.26396 11.1602C6.29655 11.4801 6.34417 11.7883 6.38407 12.0176C6.40539 12.1401 6.4278 12.2622 6.45341 12.3838C6.51991 12.6498 6.33262 12.9262 6.06962 12.9825C5.79972 13.0399 5.55695 12.8734 5.47587 12.5977C5.43009 12.442 5.42115 12.3183 5.39872 12.1895C5.3563 11.9458 5.30461 11.6127 5.26884 11.2618C5.24694 11.0467 5.22223 10.7457 5.19853 10.4356C5.17773 10.1606 5.38354 9.91976 5.65849 9.89847ZM5.59208 8.40238C6.25224 8.40238 6.25244 9.45121 5.59208 9.45121C4.93177 9.4506 4.93197 8.40299 5.59208 8.40238ZM9.06767 1.26566C9.29634 1.00742 9.69106 0.983602 9.9495 1.21195C10.2079 1.44072 10.2319 1.83535 10.0032 2.09378L9.137 3.07132L8.9622 3.54496C8.84186 3.86848 8.48103 4.03346 8.15751 3.91312C7.83456 3.79265 7.67047 3.43357 7.79032 3.11039L8.00614 2.52738C8.03292 2.45553 8.07353 2.38952 8.12431 2.33207L9.06767 1.26566Z" 15 15 + fill="currentColor" 16 16 + /> 17 17 + </svg> 18 18 + ); 19 19 + };

+20

components/Icons/ImageCoverImage.tsx

··· 1 1 + import { Props } from "./Props"; 2 2 + 1 3 export const ImageCoverImage = () => ( 2 4 <svg 3 5 width="24" ··· 12 14 /> 13 15 </svg> 14 16 ); 17 17 + 18 18 + export const ImageCoverImageRemove = (props: Props) => { 19 19 + return ( 20 20 + <svg 21 21 + width="24" 22 22 + height="24" 23 23 + viewBox="0 0 24 24" 24 24 + fill="none" 25 25 + xmlns="http://www.w3.org/2000/svg" 26 26 + {...props} 27 27 + > 28 28 + <path 29 29 + d="M21.7744 1.48538C22.0673 1.19249 22.542 1.19259 22.835 1.48538C23.1279 1.77824 23.1278 2.253 22.835 2.54592L2.22461 23.1602C1.93172 23.4526 1.45683 23.4528 1.16406 23.1602C0.871349 22.8674 0.871599 22.3926 1.16406 22.0996L21.7744 1.48538ZM22.9229 4.22561C23.1551 4.66244 23.2881 5.16029 23.2881 5.68948V18.3106C23.2879 20.0361 21.8886 21.4362 20.1631 21.4365H5.71582L6.96582 20.1865H20.1631C21.1982 20.1862 22.0379 19.3457 22.0381 18.3106V15.8067H11.3447L12.5947 14.5567H22.0381V10.1299L21.1738 9.42385L19.9775 10.9678C19.5515 11.5167 18.8233 11.7335 18.166 11.5078L16.3213 10.875C16.3092 10.8709 16.2965 10.8691 16.2842 10.8662L17.2705 9.87893L18.5723 10.3262C18.7238 10.378 18.892 10.3278 18.9902 10.2012L20.2061 8.63284L19.2764 7.87307L20.1641 6.9844L22.0381 8.51565V5.68948C22.0381 5.51371 22.0121 5.34397 21.9668 5.18264L22.9229 4.22561ZM17.6797 3.81448H3.83789C2.80236 3.81448 1.96289 4.65394 1.96289 5.68948V11.4805L4.8291 8.91897C5.18774 8.59894 5.70727 8.54438 6.12207 8.77346L6.20312 8.82327L10.083 11.4112L9.18164 12.3125L8.81055 12.0655L8.03027 12.8692C7.55062 13.3622 6.78587 13.438 6.21875 13.0489C6.17034 13.0156 6.10737 13.0113 6.05469 13.0371L4.79883 13.6573C4.258 13.9241 3.61319 13.8697 3.125 13.5157L2.26172 12.8887L1.96289 13.1573V14.5567H6.93945L5.68945 15.8067H1.96289V18.3115C1.96305 18.6614 2.06054 18.9882 2.22754 19.2686L1.32812 20.168C0.943293 19.6486 0.713079 19.0075 0.712891 18.3115V5.68948C0.712891 3.96359 2.112 2.56448 3.83789 2.56448H18.9287L17.6797 3.81448ZM14.4883 17.2578C14.9025 17.2578 15.2382 17.5937 15.2383 18.0078C15.2382 18.422 14.9025 18.7578 14.4883 18.7578H8.39453L9.89453 17.2578H14.4883ZM3.14941 18.3467C3.09734 18.2446 3.06545 18.1302 3.06543 18.0078C3.0655 17.5938 3.40144 17.2581 3.81543 17.2578H4.23828L3.14941 18.3467ZM4.71094 10.7012L4.70996 10.7002L3.21484 12.0362L3.85938 12.5039C3.97197 12.5854 4.12047 12.5976 4.24512 12.5362L5.50098 11.917C5.95928 11.6909 6.5044 11.7294 6.92578 12.0186C6.99104 12.0633 7.07958 12.0547 7.13477 11.9981L7.75488 11.3604L5.58984 9.91506L4.71094 10.7012ZM8.94629 4.52249C9.92559 4.52266 10.7195 5.31662 10.7197 6.29592C10.7197 7.27533 9.92567 8.06919 8.94629 8.06936C7.96687 8.06924 7.17292 7.27536 7.17285 6.29592C7.17304 5.31659 7.96694 4.52261 8.94629 4.52249ZM8.94629 5.52249C8.51923 5.52261 8.17304 5.86888 8.17285 6.29592C8.17292 6.72307 8.51915 7.06924 8.94629 7.06936C9.37338 7.06919 9.71966 6.72304 9.71973 6.29592C9.71954 5.86891 9.37331 5.52266 8.94629 5.52249Z" 30 30 + fill="currentColor" 31 31 + /> 32 32 + </svg> 33 33 + ); 34 34 + };

+1 -1

components/Pages/PageOptions.tsx

··· 93 93 94 94 <PageOptionButton 95 95 secondary 96 96 - onClick={() => undoManager.undo()} 96 96 + onClick={() => undoManager.redo()} 97 97 disabled={!undoState.canRedo} 98 98 > 99 99 <RedoTiny />

+5 -67

components/SelectionManager/index.tsx

··· 17 17 import { schema } from "../Blocks/TextBlock/schema"; 18 18 import { MarkType } from "prosemirror-model"; 19 19 import { useSelectingMouse, getSortedSelection } from "./selectionState"; 20 20 + import { moveBlockUp, moveBlockDown } from "src/utils/moveBlock"; 20 21 21 22 //How should I model selection? As ranges w/ a start and end? Store *blocks* so that I can just construct ranges? 22 23 // How does this relate to *when dragging* ? ··· 240 241 shift: true, 241 242 key: ["ArrowDown", "J"], 242 243 handler: async () => { 243 243 - let [sortedBlocks, siblings] = await getSortedSelectionBound(); 244 244 - let block = sortedBlocks[0]; 245 245 - let nextBlock = siblings 246 246 - .slice(siblings.findIndex((s) => s.value === block.value) + 1) 247 247 - .find( 248 248 - (f) => 249 249 - f.listData && 250 250 - block.listData && 251 251 - !f.listData.path.find((f) => f.entity === block.value), 252 252 - ); 253 253 - if ( 254 254 - nextBlock?.listData && 255 255 - block.listData && 256 256 - nextBlock.listData.depth === block.listData.depth - 1 257 257 - ) { 258 258 - if (useUIState.getState().foldedBlocks.includes(nextBlock.value)) 259 259 - useUIState.getState().toggleFold(nextBlock.value); 260 260 - await rep?.mutate.moveBlock({ 261 261 - block: block.value, 262 262 - oldParent: block.listData?.parent, 263 263 - newParent: nextBlock.value, 264 264 - position: { type: "first" }, 265 265 - }); 266 266 - } else { 267 267 - await rep?.mutate.moveBlockDown({ 268 268 - entityID: block.value, 269 269 - parent: block.listData?.parent || block.parent, 270 270 - }); 271 271 - } 244 244 + if (!rep) return; 245 245 + await moveBlockDown(rep, entity_set.set); 272 246 }, 273 247 }, 274 248 { ··· 276 250 shift: true, 277 251 key: ["ArrowUp", "K"], 278 252 handler: async () => { 279 279 - let [sortedBlocks, siblings] = await getSortedSelectionBound(); 280 280 - let block = sortedBlocks[0]; 281 281 - let previousBlock = 282 282 - siblings?.[siblings.findIndex((s) => s.value === block.value) - 1]; 283 283 - if (previousBlock.value === block.listData?.parent) { 284 284 - previousBlock = 285 285 - siblings?.[ 286 286 - siblings.findIndex((s) => s.value === block.value) - 2 287 287 - ]; 288 288 - } 289 289 - 290 290 - if ( 291 291 - previousBlock?.listData && 292 292 - block.listData && 293 293 - block.listData.depth > 1 && 294 294 - !previousBlock.listData.path.find( 295 295 - (f) => f.entity === block.listData?.parent, 296 296 - ) 297 297 - ) { 298 298 - let depth = block.listData.depth; 299 299 - let newParent = previousBlock.listData.path.find( 300 300 - (f) => f.depth === depth - 1, 301 301 - ); 302 302 - if (!newParent) return; 303 303 - if (useUIState.getState().foldedBlocks.includes(newParent.entity)) 304 304 - useUIState.getState().toggleFold(newParent.entity); 305 305 - rep?.mutate.moveBlock({ 306 306 - block: block.value, 307 307 - oldParent: block.listData?.parent, 308 308 - newParent: newParent.entity, 309 309 - position: { type: "end" }, 310 310 - }); 311 311 - } else { 312 312 - rep?.mutate.moveBlockUp({ 313 313 - entityID: block.value, 314 314 - parent: block.listData?.parent || block.parent, 315 315 - }); 316 316 - } 253 253 + if (!rep) return; 254 254 + await moveBlockUp(rep); 317 255 }, 318 256 }, 319 257

components/Toolbar/BlockToolbar.1.tsx

This is a binary file and will not be displayed.

-223

components/Toolbar/BlockToolbar.tsx

··· 1 1 - import { useEntity, useReplicache } from "src/replicache"; 2 2 - import { ToolbarButton } from "."; 3 3 - import { Separator, ShortcutKey } from "components/Layout"; 4 4 - import { metaKey } from "src/utils/metaKey"; 5 5 - import { useUIState } from "src/useUIState"; 6 6 - import { LockBlockButton } from "./LockBlockButton"; 7 7 - import { TextAlignmentButton } from "./TextAlignmentToolbar"; 8 8 - import { 9 9 - ImageFullBleedButton, 10 10 - ImageAltTextButton, 11 11 - ImageCoverButton, 12 12 - } from "./ImageToolbar"; 13 13 - import { DeleteSmall } from "components/Icons/DeleteSmall"; 14 14 - import { getSortedSelection } from "components/SelectionManager/selectionState"; 15 15 - 16 16 - export const BlockToolbar = (props: { 17 17 - setToolbarState: ( 18 18 - state: "areYouSure" | "block" | "text-alignment" | "img-alt-text", 19 19 - ) => void; 20 20 - }) => { 21 21 - let focusedEntity = useUIState((s) => s.focusedEntity); 22 22 - let focusedEntityType = useEntity( 23 23 - focusedEntity?.entityType === "page" 24 24 - ? focusedEntity.entityID 25 25 - : focusedEntity?.parent || null, 26 26 - "page/type", 27 27 - ); 28 28 - let blockType = useEntity( 29 29 - focusedEntity?.entityType === "block" ? focusedEntity?.entityID : null, 30 30 - "block/type", 31 31 - )?.data.value; 32 32 - 33 33 - return ( 34 34 - <div className="flex items-center gap-2 justify-between w-full"> 35 35 - <div className="flex items-center gap-2"> 36 36 - <ToolbarButton 37 37 - onClick={() => { 38 38 - props.setToolbarState("areYouSure"); 39 39 - }} 40 40 - tooltipContent="Delete Block" 41 41 - > 42 42 - <DeleteSmall /> 43 43 - </ToolbarButton> 44 44 - <Separator classname="h-6!" /> 45 45 - <MoveBlockButtons /> 46 46 - {blockType === "image" && ( 47 47 - <> 48 48 - <TextAlignmentButton setToolbarState={props.setToolbarState} /> 49 49 - <ImageFullBleedButton /> 50 50 - <ImageAltTextButton setToolbarState={props.setToolbarState} /> 51 51 - <ImageCoverButton /> 52 52 - {focusedEntityType?.data.value !== "canvas" && ( 53 53 - <Separator classname="h-6!" /> 54 54 - )} 55 55 - </> 56 56 - )} 57 57 - {(blockType === "button" || blockType === "datetime") && ( 58 58 - <> 59 59 - <TextAlignmentButton setToolbarState={props.setToolbarState} /> 60 60 - {focusedEntityType?.data.value !== "canvas" && ( 61 61 - <Separator classname="h-6!" /> 62 62 - )} 63 63 - </> 64 64 - )} 65 65 - 66 66 - <LockBlockButton /> 67 67 - </div> 68 68 - </div> 69 69 - ); 70 70 - }; 71 71 - 72 72 - const MoveBlockButtons = () => { 73 73 - let { rep } = useReplicache(); 74 74 - return ( 75 75 - <> 76 76 - <ToolbarButton 77 77 - hiddenOnCanvas 78 78 - onClick={async () => { 79 79 - if (!rep) return; 80 80 - let [sortedBlocks, siblings] = await getSortedSelection(rep); 81 81 - if (sortedBlocks.length > 1) return; 82 82 - let block = sortedBlocks[0]; 83 83 - let previousBlock = 84 84 - siblings?.[siblings.findIndex((s) => s.value === block.value) - 1]; 85 85 - if (previousBlock.value === block.listData?.parent) { 86 86 - previousBlock = 87 87 - siblings?.[ 88 88 - siblings.findIndex((s) => s.value === block.value) - 2 89 89 - ]; 90 90 - } 91 91 - 92 92 - if ( 93 93 - previousBlock?.listData && 94 94 - block.listData && 95 95 - block.listData.depth > 1 && 96 96 - !previousBlock.listData.path.find( 97 97 - (f) => f.entity === block.listData?.parent, 98 98 - ) 99 99 - ) { 100 100 - let depth = block.listData.depth; 101 101 - let newParent = previousBlock.listData.path.find( 102 102 - (f) => f.depth === depth - 1, 103 103 - ); 104 104 - if (!newParent) return; 105 105 - if (useUIState.getState().foldedBlocks.includes(newParent.entity)) 106 106 - useUIState.getState().toggleFold(newParent.entity); 107 107 - rep?.mutate.moveBlock({ 108 108 - block: block.value, 109 109 - oldParent: block.listData?.parent, 110 110 - newParent: newParent.entity, 111 111 - position: { type: "end" }, 112 112 - }); 113 113 - } else { 114 114 - rep?.mutate.moveBlockUp({ 115 115 - entityID: block.value, 116 116 - parent: block.listData?.parent || block.parent, 117 117 - }); 118 118 - } 119 119 - }} 120 120 - tooltipContent={ 121 121 - <div className="flex flex-col gap-1 justify-center"> 122 122 - <div className="text-center">Move Up</div> 123 123 - <div className="flex gap-1"> 124 124 - <ShortcutKey>Shift</ShortcutKey> +{" "} 125 125 - <ShortcutKey>{metaKey()}</ShortcutKey> +{" "} 126 126 - <ShortcutKey> ↑ </ShortcutKey> 127 127 - </div> 128 128 - </div> 129 129 - } 130 130 - > 131 131 - <MoveBlockUp /> 132 132 - </ToolbarButton> 133 133 - 134 134 - <ToolbarButton 135 135 - hiddenOnCanvas 136 136 - onClick={async () => { 137 137 - if (!rep) return; 138 138 - let [sortedBlocks, siblings] = await getSortedSelection(rep); 139 139 - if (sortedBlocks.length > 1) return; 140 140 - let block = sortedBlocks[0]; 141 141 - let nextBlock = siblings 142 142 - .slice(siblings.findIndex((s) => s.value === block.value) + 1) 143 143 - .find( 144 144 - (f) => 145 145 - f.listData && 146 146 - block.listData && 147 147 - !f.listData.path.find((f) => f.entity === block.value), 148 148 - ); 149 149 - if ( 150 150 - nextBlock?.listData && 151 151 - block.listData && 152 152 - nextBlock.listData.depth === block.listData.depth - 1 153 153 - ) { 154 154 - if (useUIState.getState().foldedBlocks.includes(nextBlock.value)) 155 155 - useUIState.getState().toggleFold(nextBlock.value); 156 156 - rep?.mutate.moveBlock({ 157 157 - block: block.value, 158 158 - oldParent: block.listData?.parent, 159 159 - newParent: nextBlock.value, 160 160 - position: { type: "first" }, 161 161 - }); 162 162 - } else { 163 163 - rep?.mutate.moveBlockDown({ 164 164 - entityID: block.value, 165 165 - parent: block.listData?.parent || block.parent, 166 166 - }); 167 167 - } 168 168 - }} 169 169 - tooltipContent={ 170 170 - <div className="flex flex-col gap-1 justify-center"> 171 171 - <div className="text-center">Move Down</div> 172 172 - <div className="flex gap-1"> 173 173 - <ShortcutKey>Shift</ShortcutKey> +{" "} 174 174 - <ShortcutKey>{metaKey()}</ShortcutKey> +{" "} 175 175 - <ShortcutKey> ↓ </ShortcutKey> 176 176 - </div> 177 177 - </div> 178 178 - } 179 179 - > 180 180 - <MoveBlockDown /> 181 181 - </ToolbarButton> 182 182 - <Separator classname="h-6!" /> 183 183 - </> 184 184 - ); 185 185 - }; 186 186 - 187 187 - const MoveBlockDown = () => { 188 188 - return ( 189 189 - <svg 190 190 - width="24" 191 191 - height="24" 192 192 - viewBox="0 0 24 24" 193 193 - fill="none" 194 194 - xmlns="http://www.w3.org/2000/svg" 195 195 - > 196 196 - <path 197 197 - fillRule="evenodd" 198 198 - clipRule="evenodd" 199 199 - d="M18.3444 3.56272L3.89705 5.84775C3.48792 5.91246 3.20871 6.29658 3.27342 6.7057L3.83176 10.2358C3.89647 10.645 4.28058 10.9242 4.68971 10.8595L19.137 8.57444C19.5462 8.50973 19.8254 8.12561 19.7607 7.71649L19.2023 4.18635C19.1376 3.77722 18.7535 3.49801 18.3444 3.56272ZM3.70177 4.61309C2.69864 4.77175 1.9884 5.65049 2.01462 6.63905C1.6067 6.92894 1.37517 7.43373 1.45854 7.96083L2.02167 11.5213C2.19423 12.6123 3.21854 13.3568 4.30955 13.1843L15.5014 11.4142L15.3472 10.4394L16.6131 10.2392L17.2948 13.9166L15.3038 12.4752C14.9683 12.2322 14.4994 12.3073 14.2565 12.6428C14.0135 12.9783 14.0886 13.4472 14.4241 13.6902L18.5417 16.6712L21.5228 12.5536C21.7658 12.2181 21.6907 11.7492 21.3552 11.5063C21.0197 11.2634 20.5508 11.3385 20.3079 11.674L18.7926 13.7669L18.0952 10.0048L19.3323 9.80909C20.4233 9.63654 21.1679 8.61222 20.9953 7.52121L20.437 3.99107C20.2644 2.90007 19.2401 2.15551 18.1491 2.32807L3.70177 4.61309ZM12.5175 14.1726C12.8583 14.118 13.0904 13.7974 13.0358 13.4566C12.9812 13.1157 12.6606 12.8837 12.3198 12.9383L4.48217 14.1937C3.37941 14.3704 2.62785 15.4065 2.80232 16.5096L3.35244 19.9878C3.52716 21.0925 4.56428 21.8463 5.66893 21.6716L20.0583 19.3958C21.1618 19.2212 21.9155 18.186 21.7426 17.0822L21.6508 16.4961C21.5974 16.1551 21.2776 15.922 20.9366 15.9754C20.5956 16.0288 20.3624 16.3486 20.4158 16.6896L20.5077 17.2757C20.5738 17.6981 20.2854 18.0943 19.8631 18.1611L5.47365 20.437C5.05089 20.5038 4.65396 20.2153 4.5871 19.7925L4.03697 16.3143C3.9702 15.8921 4.25783 15.4956 4.67988 15.428L12.5175 14.1726ZM5.48645 8.13141C5.4213 7.72235 5.70009 7.33793 6.10914 7.27278L12.7667 6.21241C13.1757 6.14726 13.5602 6.42605 13.6253 6.83511C13.6905 7.24417 13.4117 7.62859 13.0026 7.69374L6.34508 8.75411C5.93602 8.81926 5.5516 8.54047 5.48645 8.13141Z" 200 200 - fill="currentColor" 201 201 - /> 202 202 - </svg> 203 203 - ); 204 204 - }; 205 205 - 206 206 - const MoveBlockUp = () => { 207 207 - return ( 208 208 - <svg 209 209 - width="24" 210 210 - height="24" 211 211 - viewBox="0 0 24 24" 212 212 - fill="none" 213 213 - xmlns="http://www.w3.org/2000/svg" 214 214 - > 215 215 - <path 216 216 - fillRule="evenodd" 217 217 - clipRule="evenodd" 218 218 - d="M4.12086 10.3069C3.69777 10.3744 3.30016 10.0858 3.23323 9.66265L2.68364 6.18782C2.61677 5.76506 2.90529 5.36813 3.32805 5.30127L17.7149 3.0258C18.1378 2.95892 18.5348 3.24759 18.6015 3.67049L18.7835 4.82361C18.8373 5.16457 19.1573 5.39736 19.4983 5.34356C19.8392 5.28975 20.072 4.96974 20.0182 4.62878L19.8363 3.47566C19.6619 2.37067 18.6246 1.61639 17.5197 1.79115L3.13278 4.06661C2.02813 4.24133 1.27427 5.27845 1.44899 6.3831L1.99857 9.85793C2.17346 10.9637 3.21238 11.7177 4.31788 11.5413L11.5185 10.392C11.8594 10.3376 12.0916 10.0171 12.0372 9.67628C11.9828 9.33542 11.6624 9.1032 11.3215 9.15761L4.12086 10.3069ZM19.9004 11.6151L5.45305 13.9001C5.04392 13.9649 4.76471 14.349 4.82942 14.7581L5.38775 18.2882C5.45246 18.6974 5.83658 18.9766 6.24571 18.9119L20.6931 16.6268C21.1022 16.5621 21.3814 16.178 21.3167 15.7689L20.7583 12.2388C20.6936 11.8296 20.3095 11.5504 19.9004 11.6151ZM5.25777 12.6655C4.21806 12.8299 3.49299 13.7679 3.57645 14.8C3.17867 15.1511 2.9637 15.6918 3.05264 16.2541L3.57767 19.5737C3.75023 20.6647 4.77455 21.4093 5.86556 21.2367L19.9927 19.0023C20.7197 18.8873 21.2751 18.3524 21.4519 17.6846C22.2223 17.3097 22.6921 16.4638 22.5513 15.5736L21.993 12.0435C21.8204 10.9525 20.7961 10.2079 19.7051 10.3805L17.9019 10.6657L17.3957 7.46986L19.3483 8.96297C19.6773 9.21457 20.148 9.1518 20.3996 8.82276C20.6512 8.49373 20.5885 8.02302 20.2594 7.77141L16.2213 4.68355L13.1334 8.72172C12.8818 9.05076 12.9445 9.52146 13.2736 9.77307C13.6026 10.0247 14.0733 9.96191 14.3249 9.63287L15.8945 7.58034L16.4203 10.9L5.25777 12.6655ZM7.66514 15.3252C7.25609 15.3903 6.97729 15.7748 7.04245 16.1838C7.1076 16.5929 7.49202 16.8717 7.90108 16.8065L14.5586 15.7461C14.9677 15.681 15.2465 15.2966 15.1813 14.8875C15.1162 14.4785 14.7317 14.1997 14.3227 14.2648L7.66514 15.3252Z" 219 219 - fill="currentColor" 220 220 - /> 221 221 - </svg> 222 222 - ); 223 223 - };

+36 -8

components/Toolbar/ImageToolbar.tsx

··· 6 6 import { ImageAltSmall, ImageRemoveAltSmall } from "components/Icons/ImageAlt"; 7 7 import { useLeafletPublicationData } from "components/PageSWRDataProvider"; 8 8 import { useSubscribe } from "src/replicache/useSubscribe"; 9 9 - import { ImageCoverImage } from "components/Icons/ImageCoverImage"; 9 9 + import { 10 10 + ImageCoverImage, 11 11 + ImageCoverImageRemove, 12 12 + } from "components/Icons/ImageCoverImage"; 13 13 + import { Separator } from "components/Layout"; 14 14 + import { TextAlignmentButton } from "./TextAlignmentToolbar"; 15 15 + 16 16 + export const ImageToolbar = (props: { 17 17 + setToolbarState: (state: "image" | "text-alignment") => void; 18 18 + }) => { 19 19 + let focusedEntity = useUIState((s) => s.focusedEntity); 20 20 + let focusedEntityType = useEntity( 21 21 + focusedEntity?.entityType === "page" 22 22 + ? focusedEntity.entityID 23 23 + : focusedEntity?.parent || null, 24 24 + "page/type", 25 25 + ); 26 26 + 27 27 + return ( 28 28 + <div className="flex items-center gap-2 justify-between w-full"> 29 29 + <div className="flex items-center gap-2"> 30 30 + <TextAlignmentButton setToolbarState={props.setToolbarState} /> 31 31 + <ImageAltTextButton /> 32 32 + <ImageFullBleedButton /> 33 33 + <ImageCoverButton /> 34 34 + {focusedEntityType?.data.value !== "canvas" && ( 35 35 + <Separator classname="h-6!" /> 36 36 + )} 37 37 + </div> 38 38 + </div> 39 39 + ); 40 40 + }; 10 41 11 42 export const ImageFullBleedButton = (props: {}) => { 12 43 let { rep } = useReplicache(); ··· 36 67 ); 37 68 }; 38 69 39 39 - export const ImageAltTextButton = (props: { 40 40 - setToolbarState: (s: "img-alt-text") => void; 41 41 - }) => { 70 70 + export const ImageAltTextButton = (props: {}) => { 42 71 let { rep } = useReplicache(); 43 72 let focusedBlock = useUIState((s) => s.focusedEntity)?.entityID || null; 44 73 ··· 48 77 let altEditorOpen = useUIState((s) => s.openPopover === focusedBlock); 49 78 let hasSrc = useEntity(focusedBlock, "block/image")?.data; 50 79 if (!hasSrc) return null; 51 51 - 52 80 return ( 53 81 <ToolbarButton 54 82 active={altText !== undefined} 55 83 onClick={async (e) => { 56 84 e.preventDefault(); 57 85 if (!focusedBlock) return; 58 58 - if (!altText) { 86 86 + if (altText === undefined) { 59 87 await rep?.mutate.assertFact({ 60 88 entity: focusedBlock, 61 89 attribute: "image/alt", ··· 109 137 } 110 138 }} 111 139 tooltipContent={ 112 112 - <div>{isCoverImage ? "Remove Cover Image" : "Set as Cover Image"}</div> 140 140 + <div>{isCoverImage ? "Remove Cover Image" : "Use as Cover Image"}</div> 113 141 } 114 142 > 115 115 - <ImageCoverImage /> 143 143 + {isCoverImage ? <ImageCoverImageRemove /> : <ImageCoverImage />} 116 144 </ToolbarButton> 117 145 ); 118 146 };

-103

components/Toolbar/LockBlockButton.tsx

··· 1 1 - import { useUIState } from "src/useUIState"; 2 2 - import { ToolbarButton } from "."; 3 3 - import { useEntity, useReplicache } from "src/replicache"; 4 4 - 5 5 - import { focusBlock } from "src/utils/focusBlock"; 6 6 - import { Props } from "components/Icons/Props"; 7 7 - 8 8 - export function LockBlockButton() { 9 9 - let focusedBlock = useUIState((s) => s.focusedEntity); 10 10 - let selectedBlocks = useUIState((s) => s.selectedBlocks); 11 11 - let type = useEntity(focusedBlock?.entityID || null, "block/type"); 12 12 - let locked = useEntity(focusedBlock?.entityID || null, "block/is-locked"); 13 13 - let { rep } = useReplicache(); 14 14 - if (focusedBlock?.entityType !== "block") return; 15 15 - return ( 16 16 - <ToolbarButton 17 17 - disabled={false} 18 18 - onClick={async () => { 19 19 - if (!locked?.data.value) { 20 20 - await rep?.mutate.assertFact({ 21 21 - entity: focusedBlock.entityID, 22 22 - attribute: "block/is-locked", 23 23 - data: { value: true, type: "boolean" }, 24 24 - }); 25 25 - if (selectedBlocks.length > 1) { 26 26 - for (let block of selectedBlocks) { 27 27 - await rep?.mutate.assertFact({ 28 28 - attribute: "block/is-locked", 29 29 - entity: block.value, 30 30 - data: { value: true, type: "boolean" }, 31 31 - }); 32 32 - } 33 33 - } 34 34 - } else { 35 35 - await rep?.mutate.retractFact({ factID: locked.id }); 36 36 - if (selectedBlocks.length > 1) { 37 37 - for (let block of selectedBlocks) { 38 38 - await rep?.mutate.retractAttribute({ 39 39 - attribute: "block/is-locked", 40 40 - entity: block.value, 41 41 - }); 42 42 - } 43 43 - } else { 44 44 - type && 45 45 - focusBlock( 46 46 - { 47 47 - type: type.data.value, 48 48 - parent: focusedBlock.parent, 49 49 - value: focusedBlock.entityID, 50 50 - }, 51 51 - { type: "end" }, 52 52 - ); 53 53 - } 54 54 - } 55 55 - }} 56 56 - tooltipContent={ 57 57 - <span>{!locked?.data.value ? "Lock Editing" : " Unlock to Edit"}</span> 58 58 - } 59 59 - > 60 60 - {!locked?.data.value ? <LockSmall /> : <UnlockSmall />} 61 61 - </ToolbarButton> 62 62 - ); 63 63 - } 64 64 - 65 65 - const LockSmall = (props: Props) => { 66 66 - return ( 67 67 - <svg 68 68 - width="24" 69 69 - height="24" 70 70 - viewBox="0 0 24 24" 71 71 - fill="none" 72 72 - xmlns="http://www.w3.org/2000/svg" 73 73 - {...props} 74 74 - > 75 75 - <path 76 76 - fillRule="evenodd" 77 77 - clipRule="evenodd" 78 78 - d="M12 3.9657C9.73217 3.9657 7.89374 5.80413 7.89374 8.07196V10.1794H7.78851C6.82201 10.1794 6.03851 10.9629 6.03851 11.9294V17C6.03851 18.6569 7.38166 20 9.03851 20H14.9615C16.6184 20 17.9615 18.6569 17.9615 17V11.9294C17.9615 10.9629 17.178 10.1794 16.2115 10.1794H16.1063V8.07196C16.1063 5.80413 14.2678 3.9657 12 3.9657ZM14.3563 10.1794V8.07196C14.3563 6.77063 13.3013 5.7157 12 5.7157C10.6987 5.7157 9.64374 6.77063 9.64374 8.07196V10.1794H14.3563ZM12.5824 15.3512C12.9924 15.1399 13.2727 14.7123 13.2727 14.2193C13.2727 13.5165 12.7029 12.9467 12 12.9467C11.2972 12.9467 10.7274 13.5165 10.7274 14.2193C10.7274 14.7271 11.0247 15.1654 11.4548 15.3696L11.2418 17.267C11.2252 17.4152 11.3411 17.5449 11.4902 17.5449H12.5147C12.6621 17.5449 12.7774 17.4181 12.7636 17.2714L12.5824 15.3512Z" 79 79 - fill="currentColor" 80 80 - /> 81 81 - </svg> 82 82 - ); 83 83 - }; 84 84 - 85 85 - const UnlockSmall = (props: Props) => { 86 86 - return ( 87 87 - <svg 88 88 - width="24" 89 89 - height="24" 90 90 - viewBox="0 0 24 24" 91 91 - fill="none" 92 92 - xmlns="http://www.w3.org/2000/svg" 93 93 - {...props} 94 94 - > 95 95 - <path 96 96 - fillRule="evenodd" 97 97 - clipRule="evenodd" 98 98 - d="M7.89376 6.62482C7.89376 4.35699 9.7322 2.51855 12 2.51855C14.2678 2.51855 16.1063 4.35699 16.1063 6.62482V10.1794H16.2115C17.178 10.1794 17.9615 10.9629 17.9615 11.9294V17C17.9615 18.6569 16.6184 20 14.9615 20H9.03854C7.38168 20 6.03854 18.6569 6.03854 17V11.9294C6.03854 10.9629 6.82204 10.1794 7.78854 10.1794H14.3563V6.62482C14.3563 5.32349 13.3013 4.26855 12 4.26855C10.6987 4.26855 9.64376 5.32349 9.64376 6.62482V7.72078C9.64376 8.20403 9.25201 8.59578 8.76876 8.59578C8.28551 8.59578 7.89376 8.20403 7.89376 7.72078V6.62482ZM13.1496 14.2193C13.1496 14.7123 12.8693 15.1399 12.4593 15.3512L12.6405 17.2714C12.6544 17.4181 12.539 17.5449 12.3916 17.5449H11.3672C11.218 17.5449 11.1021 17.4152 11.1187 17.267L11.3317 15.3696C10.9016 15.1654 10.6043 14.7271 10.6043 14.2193C10.6043 13.5165 11.1741 12.9467 11.8769 12.9467C12.5798 12.9467 13.1496 13.5165 13.1496 14.2193ZM5.62896 5.3862C5.4215 5.20395 5.10558 5.2244 4.92333 5.43186C4.74109 5.63932 4.76153 5.95525 4.969 6.13749L6.06209 7.09771C6.26955 7.27996 6.58548 7.25951 6.76772 7.05205C6.94997 6.84458 6.92952 6.52866 6.72206 6.34642L5.62896 5.3862ZM3.5165 6.64283C3.25418 6.55657 2.97159 6.69929 2.88533 6.96161C2.79906 7.22393 2.94178 7.50652 3.20411 7.59278L5.54822 8.36366C5.81054 8.44992 6.09313 8.3072 6.1794 8.04488C6.26566 7.78256 6.12294 7.49997 5.86062 7.41371L3.5165 6.64283ZM3.54574 9.42431C3.52207 9.14918 3.72592 8.90696 4.00105 8.8833L5.52254 8.75244C5.79766 8.72878 6.03988 8.93263 6.06354 9.20776C6.08721 9.48288 5.88335 9.7251 5.60823 9.74876L4.08674 9.87962C3.81162 9.90329 3.5694 9.69943 3.54574 9.42431Z" 99 99 - fill="currentColor" 100 100 - /> 101 101 - </svg> 102 102 - ); 103 103 - };

+33 -12

components/Toolbar/MultiSelectToolbar.tsx

··· 2 2 import { ReplicacheMutators, useReplicache } from "src/replicache"; 3 3 import { ToolbarButton } from "./index"; 4 4 import { copySelection } from "src/utils/copySelection"; 5 5 - import { useSmoker } from "components/Toast"; 6 6 - import { getBlocksWithType } from "src/hooks/queries/useBlocks"; 7 7 - import { Replicache } from "replicache"; 8 8 - import { LockBlockButton } from "./LockBlockButton"; 5 5 + import { useSmoker, useToaster } from "components/Toast"; 6 6 + 9 7 import { Props } from "components/Icons/Props"; 10 8 import { TextAlignmentButton } from "./TextAlignmentToolbar"; 11 9 import { getSortedSelection } from "components/SelectionManager/selectionState"; 10 10 + import { deleteBlock } from "src/utils/deleteBlock"; 11 11 + import { Separator, ShortcutKey } from "components/Layout"; 12 12 13 13 export const MultiselectToolbar = (props: { 14 14 - setToolbarState: ( 15 15 - state: "areYouSure" | "multiselect" | "text-alignment", 16 16 - ) => void; 14 14 + setToolbarState: (state: "multiselect" | "text-alignment") => void; 17 15 }) => { 18 18 - const { rep } = useReplicache(); 16 16 + const { rep, undoManager } = useReplicache(); 19 17 const smoker = useSmoker(); 18 18 + const toaster = useToaster(); 20 19 21 20 const handleCopy = async (event: React.MouseEvent) => { 22 21 if (!rep) return; 23 23 - const [sortedSelection] = await getSortedSelection(rep); 22 22 + let [sortedSelection] = await getSortedSelection(rep); 24 23 await copySelection(rep, sortedSelection); 25 24 smoker({ 26 25 position: { x: event.clientX, y: event.clientY }, ··· 33 32 <div className="flex items-center gap-2"> 34 33 <ToolbarButton 35 34 tooltipContent="Delete Selected Blocks" 36 36 - onClick={() => { 37 37 - props.setToolbarState("areYouSure"); 35 35 + onClick={async (e) => { 36 36 + e.stopPropagation(); 37 37 + if (!rep) return; 38 38 + let [sortedSelection] = await getSortedSelection(rep); 39 39 + await deleteBlock( 40 40 + sortedSelection.map((b) => b.value), 41 41 + rep, 42 42 + undoManager, 43 43 + ); 44 44 + 45 45 + toaster({ 46 46 + content: ( 47 47 + <div className="font-bold items-center flex"> 48 48 + {sortedSelection.length} block 49 49 + {sortedSelection.length === 1 ? "" : "s"} deleted!{" "} 50 50 + <span className="px-2 flex"> 51 51 + <ShortcutKey>Ctrl</ShortcutKey> 52 52 + <ShortcutKey>Z</ShortcutKey>{" "} 53 53 + </span> 54 54 + to undo. 55 55 + </div> 56 56 + ), 57 57 + type: "success", 58 58 + }); 38 59 }} 39 60 > 40 61 <TrashSmall /> ··· 47 68 <CopySmall /> 48 69 </ToolbarButton> 49 70 <TextAlignmentButton setToolbarState={props.setToolbarState} /> 50 50 - <LockBlockButton /> 71 71 + <Separator classname="h-6!" /> 51 72 </div> 52 73 </div> 53 74 );

+8

components/Toolbar/TextAlignmentToolbar.tsx

··· 7 7 export function TextAlignmentToolbar() { 8 8 let focusedBlock = useUIState((s) => s.focusedEntity); 9 9 let { rep } = useReplicache(); 10 10 + let alignment = useEntity( 11 11 + focusedBlock?.entityID || null, 12 12 + "block/text-alignment", 13 13 + )?.data.value; 10 14 let setAlignment = useCallback( 11 15 (alignment: Fact<"block/text-alignment">["data"]["value"]) => { 12 16 let blocks = useUIState.getState().selectedBlocks; ··· 26 30 <ToolbarButton 27 31 onClick={() => setAlignment("left")} 28 32 tooltipContent="Align Left" 33 33 + active={alignment === "left"} 29 34 > 30 35 <AlignLeftSmall /> 31 36 </ToolbarButton> 32 37 <ToolbarButton 33 38 onClick={() => setAlignment("center")} 34 39 tooltipContent="Align Center" 40 40 + active={alignment === "center"} 35 41 > 36 42 <AlignCenterSmall /> 37 43 </ToolbarButton> 38 44 <ToolbarButton 39 45 onClick={() => setAlignment("right")} 40 46 tooltipContent="Align Right" 47 47 + active={alignment === "right"} 41 48 > 42 49 <AlignRightSmall /> 43 50 </ToolbarButton> ··· 45 52 <ToolbarButton 46 53 onClick={() => setAlignment("justify")} 47 54 tooltipContent="Align Justified" 55 55 + active={alignment === "justify"} 48 56 > 49 57 <AlignJustifiedSmall /> 50 58 </ToolbarButton>

-3

components/Toolbar/TextToolbar.tsx

··· 8 8 import { ToolbarTypes } from "."; 9 9 import { schema } from "components/Blocks/TextBlock/schema"; 10 10 import { TextAlignmentButton } from "./TextAlignmentToolbar"; 11 11 - import { LockBlockButton } from "./LockBlockButton"; 12 11 import { Props } from "components/Icons/Props"; 13 12 import { isMac } from "src/utils/isDevice"; 14 13 ··· 81 80 <TextAlignmentButton setToolbarState={props.setToolbarState} /> 82 81 <ListButton setToolbarState={props.setToolbarState} /> 83 82 <Separator classname="h-6!" /> 84 84 - 85 85 - <LockBlockButton /> 86 83 </> 87 84 ); 88 85 };

+57 -87

components/Toolbar/index.tsx

··· 11 11 import { ListToolbar } from "./ListToolbar"; 12 12 import { HighlightToolbar } from "./HighlightToolbar"; 13 13 import { TextToolbar } from "./TextToolbar"; 14 14 - import { BlockToolbar } from "./BlockToolbar"; 14 14 + import { ImageToolbar } from "./ImageToolbar"; 15 15 import { MultiselectToolbar } from "./MultiSelectToolbar"; 16 16 - import { AreYouSure } from "components/Blocks/DeleteBlock"; 17 17 - import { deleteBlock } from "src/utils/deleteBlock"; 18 16 import { TooltipButton } from "components/Buttons"; 19 17 import { TextAlignmentToolbar } from "./TextAlignmentToolbar"; 20 18 import { useIsMobile } from "src/hooks/isMobile"; 21 19 import { CloseTiny } from "components/Icons/CloseTiny"; 22 20 23 21 export type ToolbarTypes = 24 24 - | "areYouSure" 25 22 | "default" 26 26 - | "block" 27 23 | "multiselect" 28 24 | "highlight" 29 25 | "link" ··· 31 27 | "text-alignment" 32 28 | "list" 33 29 | "linkBlock" 34 34 - | "img-alt-text"; 35 35 - 36 36 - export const Toolbar = (props: { pageID: string; blockID: string }) => { 37 37 - let { rep } = useReplicache(); 30 30 + | "img-alt-text" 31 31 + | "image"; 38 32 33 33 + export const Toolbar = (props: { 34 34 + pageID: string; 35 35 + blockID: string; 36 36 + blockType: string | null | undefined; 37 37 + }) => { 39 38 let [toolbarState, setToolbarState] = useState<ToolbarTypes>("default"); 40 39 41 41 - let focusedEntity = useUIState((s) => s.focusedEntity); 42 42 - let selectedBlocks = useUIState((s) => s.selectedBlocks); 43 40 let activeEditor = useEditorStates((s) => s.editorStates[props.blockID]); 44 44 - 45 45 - let blockType = useEntity(props.blockID, "block/type")?.data.value; 41 41 + let selectedBlocks = useUIState((s) => s.selectedBlocks); 46 42 47 43 let lastUsedHighlight = useUIState((s) => s.lastUsedHighlight); 48 44 let setLastUsedHighlight = (color: "1" | "2" | "3") => ··· 64 60 }; 65 61 }, [toolbarState]); 66 62 67 67 - useEffect(() => { 68 68 - if (!blockType) return; 69 69 - if ( 70 70 - blockType !== "heading" && 71 71 - blockType !== "text" && 72 72 - blockType !== "blockquote" 73 73 - ) { 74 74 - setToolbarState("block"); 75 75 - } else { 76 76 - setToolbarState("default"); 77 77 - } 78 78 - }, [blockType]); 63 63 + let isTextBlock = 64 64 + props.blockType === "heading" || 65 65 + props.blockType === "text" || 66 66 + props.blockType === "blockquote"; 79 67 80 68 useEffect(() => { 81 81 - if ( 82 82 - selectedBlocks.length > 1 && 83 83 - !["areYousure", "text-alignment"].includes(toolbarState) 84 84 - ) { 69 69 + if (selectedBlocks.length > 1) { 85 70 setToolbarState("multiselect"); 86 86 - } else if (toolbarState === "multiselect") { 71 71 + return; 72 72 + } 73 73 + if (isTextBlock) { 87 74 setToolbarState("default"); 88 75 } 89 89 - }, [selectedBlocks.length, toolbarState]); 90 90 - let isMobile = useIsMobile(); 76 76 + if (props.blockType === "image") { 77 77 + setToolbarState("image"); 78 78 + } 79 79 + if (props.blockType === "button" || props.blockType === "datetime") { 80 80 + setToolbarState("text-alignment"); 81 81 + } else null; 82 82 + }, [props.blockType, selectedBlocks]); 91 83 84 84 + let isMobile = useIsMobile(); 92 85 return ( 93 86 <Tooltip.Provider> 94 87 <div ··· 125 118 <TextBlockTypeToolbar onClose={() => setToolbarState("default")} /> 126 119 ) : toolbarState === "text-alignment" ? ( 127 120 <TextAlignmentToolbar /> 128 128 - ) : toolbarState === "block" ? ( 129 129 - <BlockToolbar setToolbarState={setToolbarState} /> 121 121 + ) : toolbarState === "image" ? ( 122 122 + <ImageToolbar setToolbarState={setToolbarState} /> 130 123 ) : toolbarState === "multiselect" ? ( 131 124 <MultiselectToolbar setToolbarState={setToolbarState} /> 132 132 - ) : toolbarState === "areYouSure" ? ( 133 133 - <AreYouSure 134 134 - compact 135 135 - type={blockType} 136 136 - entityID={selectedBlocks.map((b) => b.value)} 137 137 - onClick={() => { 138 138 - rep && 139 139 - deleteBlock( 140 140 - selectedBlocks.map((b) => b.value), 141 141 - rep, 142 142 - ); 143 143 - }} 144 144 - closeAreYouSure={() => { 145 145 - setToolbarState( 146 146 - selectedBlocks.length > 1 147 147 - ? "multiselect" 148 148 - : blockType !== "heading" && blockType !== "text" 149 149 - ? "block" 150 150 - : "default", 151 151 - ); 152 152 - }} 153 153 - /> 154 125 ) : null} 155 126 </div> 156 127 {/* if the thing is are you sure state, don't show the x... is each thing handling its own are you sure? theres no need for that */} 157 157 - {toolbarState !== "areYouSure" && ( 158 158 - <button 159 159 - className="toolbarBackToDefault hover:text-accent-contrast" 160 160 - onMouseDown={(e) => { 161 161 - e.preventDefault(); 162 162 - if ( 163 163 - toolbarState === "multiselect" || 164 164 - toolbarState === "block" || 165 165 - toolbarState === "default" 166 166 - ) { 167 167 - useUIState.setState(() => ({ 168 168 - focusedEntity: { 169 169 - entityType: "page", 170 170 - entityID: props.pageID, 171 171 - }, 172 172 - selectedBlocks: [], 173 173 - })); 174 174 - } else { 175 175 - if (blockType !== "heading" && blockType !== "text") { 176 176 - setToolbarState("block"); 177 177 - } else { 178 178 - setToolbarState("default"); 179 179 - } 128 128 + 129 129 + <button 130 130 + className="toolbarBackToDefault hover:text-accent-contrast" 131 131 + onMouseDown={(e) => { 132 132 + e.preventDefault(); 133 133 + if ( 134 134 + toolbarState === "multiselect" || 135 135 + toolbarState === "image" || 136 136 + toolbarState === "default" 137 137 + ) { 138 138 + // close the toolbar 139 139 + useUIState.setState(() => ({ 140 140 + focusedEntity: { 141 141 + entityType: "page", 142 142 + entityID: props.pageID, 143 143 + }, 144 144 + selectedBlocks: [], 145 145 + })); 146 146 + } else { 147 147 + if (props.blockType === "image") { 148 148 + setToolbarState("image"); 180 149 } 181 181 - }} 182 182 - > 183 183 - <CloseTiny /> 184 184 - </button> 185 185 - )} 150 150 + if (isTextBlock) { 151 151 + setToolbarState("default"); 152 152 + } 153 153 + } 154 154 + }} 155 155 + > 156 156 + <CloseTiny /> 157 157 + </button> 186 158 </div> 187 159 </Tooltip.Provider> 188 160 ); ··· 198 170 hiddenOnCanvas?: boolean; 199 171 }) => { 200 172 let focusedEntity = useUIState((s) => s.focusedEntity); 201 201 - let isLocked = useEntity(focusedEntity?.entityID || null, "block/is-locked"); 202 202 - let isDisabled = 203 203 - props.disabled === undefined ? !!isLocked?.data.value : props.disabled; 173 173 + let isDisabled = props.disabled; 204 174 205 175 let focusedEntityType = useEntity( 206 176 focusedEntity?.entityType === "page"

+1 -1

src/hooks/useLongPress.ts

··· 90 90 return useMemo( 91 91 () => ({ 92 92 isLongPress: isLongPress, 93 93 - handlers: { 93 93 + longPressHandlers: { 94 94 onPointerDown, 95 95 onPointerUp: end, 96 96 onClickCapture: click,

+7

src/replicache/clientMutationContext.ts

··· 67 67 textData.value = base64.fromByteArray(updateBytes); 68 68 } 69 69 } 70 70 + } else if (f.id) { 71 71 + // For cardinality "many" with an explicit ID, fetch the existing fact 72 72 + // so undo can restore it instead of deleting 73 73 + let fact = await tx.get(f.id); 74 74 + if (fact) { 75 75 + existingFact = [fact as Fact<any>]; 76 76 + } 70 77 } 71 78 if (!ignoreUndo) 72 79 undoManager.add({

+31 -10

src/replicache/mutations.ts

··· 4 4 import { SupabaseClient } from "@supabase/supabase-js"; 5 5 import { Database } from "supabase/database.types"; 6 6 import { generateKeyBetween } from "fractional-indexing"; 7 7 + import { v7 } from "uuid"; 7 8 8 9 export type MutationContext = { 9 10 permission_token_id: string; ··· 307 308 { blockEntity: string } | { blockEntity: string }[] 308 309 > = async (args, ctx) => { 309 310 for (let block of [args].flat()) { 310 310 - let [isLocked] = await ctx.scanIndex.eav( 311 311 - block.blockEntity, 312 312 - "block/is-locked", 313 313 - ); 314 314 - if (isLocked?.data.value) continue; 315 311 let [image] = await ctx.scanIndex.eav(block.blockEntity, "block/image"); 316 312 await ctx.runOnServer(async ({ supabase }) => { 317 313 if (image) { ··· 427 423 }, 428 424 }); 429 425 }; 430 430 - const moveBlockDown: Mutation<{ entityID: string; parent: string }> = async ( 431 431 - args, 432 432 - ctx, 433 433 - ) => { 426 426 + const moveBlockDown: Mutation<{ 427 427 + entityID: string; 428 428 + parent: string; 429 429 + permission_set?: string; 430 430 + }> = async (args, ctx) => { 434 431 let children = (await ctx.scanIndex.eav(args.parent, "card/block")).toSorted( 435 432 (a, b) => (a.data.position > b.data.position ? 1 : -1), 436 433 ); 437 434 let index = children.findIndex((f) => f.data.value === args.entityID); 438 435 if (index === -1) return; 439 436 let next = children[index + 1]; 440 440 - if (!next) return; 437 437 + if (!next) { 438 438 + // If this is the last block, create a new empty block above it using the addBlock helper 439 439 + if (!args.permission_set) return; // Can't create block without permission_set 440 440 + 441 441 + let newEntityID = v7(); 442 442 + let previousBlock = children[index - 1]; 443 443 + let position = generateKeyBetween( 444 444 + previousBlock?.data.position || null, 445 445 + children[index].data.position, 446 446 + ); 447 447 + 448 448 + // Call the addBlock mutation helper directly 449 449 + await addBlock( 450 450 + { 451 451 + parent: args.parent, 452 452 + permission_set: args.permission_set, 453 453 + factID: v7(), 454 454 + type: "text", 455 455 + newEntityID: newEntityID, 456 456 + position: position, 457 457 + }, 458 458 + ctx, 459 459 + ); 460 460 + return; 461 461 + } 441 462 await ctx.retractFact(children[index].id); 442 463 await ctx.assertFact({ 443 464 id: children[index].id,

+10 -2

src/utils/deleteBlock.ts

··· 4 4 import { scanIndex } from "src/replicache/utils"; 5 5 import { getBlocksWithType } from "src/hooks/queries/useBlocks"; 6 6 import { focusBlock } from "src/utils/focusBlock"; 7 7 + import { UndoManager } from "src/undoManager"; 7 8 8 9 export async function deleteBlock( 9 10 entities: string[], 10 11 rep: Replicache<ReplicacheMutators>, 12 12 + undoManager?: UndoManager, 11 13 ) { 12 14 // get what pagess we need to close as a result of deleting this block 13 15 let pagesToClose = [] as string[]; ··· 32 34 } 33 35 } 34 36 35 35 - // the next and previous blocks in the block list 36 36 - // if the focused thing is a page and not a block, return 37 37 + // figure out what to focus 37 38 let focusedBlock = useUIState.getState().focusedEntity; 38 39 let parent = 39 40 focusedBlock?.entityType === "page" ··· 44 45 let parentType = await rep?.query((tx) => 45 46 scanIndex(tx).eav(parent, "page/type"), 46 47 ); 48 48 + // if the page is a canvas, focus the page 47 49 if (parentType[0]?.data.value === "canvas") { 48 50 useUIState 49 51 .getState() 50 52 .setFocusedBlock({ entityType: "page", entityID: parent }); 51 53 useUIState.getState().setSelectedBlocks([]); 52 54 } else { 55 55 + // if the page is a doc, focus the previous block (or if there isn't a prev block, focus the next block) 53 56 let siblings = 54 57 (await rep?.query((tx) => getBlocksWithType(tx, parent))) || []; 55 58 ··· 105 108 } 106 109 } 107 110 111 111 + // close the pages 108 112 pagesToClose.forEach((page) => page && useUIState.getState().closePage(page)); 113 113 + undoManager && undoManager.startGroup(); 114 114 + 115 115 + // delete the blocks 109 116 await Promise.all( 110 117 entities.map((entity) => 111 118 rep?.mutate.removeBlock({ ··· 113 120 }), 114 121 ), 115 122 ); 123 123 + undoManager && undoManager.endGroup(); 116 124 }

+3 -1

src/utils/focusBlock.ts

··· 48 48 } 49 49 50 50 if (pos?.offset !== undefined) { 51 51 - el?.focus(); 51 51 + // trying to focus the block in a subpage causes the page to flash and scroll back to the parent page. 52 52 + // idk how to fix so i'm giving up -- celine 53 53 + // el?.focus(); 52 54 requestAnimationFrame(() => { 53 55 el?.setSelectionRange(pos.offset, pos.offset); 54 56 });

+81

src/utils/moveBlock.ts

··· 1 1 + import { Replicache } from "replicache"; 2 2 + import { ReplicacheMutators } from "src/replicache"; 3 3 + import { getSortedSelection } from "components/SelectionManager/selectionState"; 4 4 + import { useUIState } from "src/useUIState"; 5 5 + 6 6 + export const moveBlockUp = async (rep: Replicache<ReplicacheMutators>) => { 7 7 + let [sortedBlocks, siblings] = await getSortedSelection(rep); 8 8 + if (sortedBlocks.length > 1) return; 9 9 + let block = sortedBlocks[0]; 10 10 + let previousBlock = 11 11 + siblings?.[siblings.findIndex((s) => s.value === block.value) - 1]; 12 12 + if (previousBlock.value === block.listData?.parent) { 13 13 + previousBlock = 14 14 + siblings?.[siblings.findIndex((s) => s.value === block.value) - 2]; 15 15 + } 16 16 + 17 17 + if ( 18 18 + previousBlock?.listData && 19 19 + block.listData && 20 20 + block.listData.depth > 1 && 21 21 + !previousBlock.listData.path.find( 22 22 + (f) => f.entity === block.listData?.parent, 23 23 + ) 24 24 + ) { 25 25 + let depth = block.listData.depth; 26 26 + let newParent = previousBlock.listData.path.find( 27 27 + (f) => f.depth === depth - 1, 28 28 + ); 29 29 + if (!newParent) return; 30 30 + if (useUIState.getState().foldedBlocks.includes(newParent.entity)) 31 31 + useUIState.getState().toggleFold(newParent.entity); 32 32 + rep?.mutate.moveBlock({ 33 33 + block: block.value, 34 34 + oldParent: block.listData?.parent, 35 35 + newParent: newParent.entity, 36 36 + position: { type: "end" }, 37 37 + }); 38 38 + } else { 39 39 + rep?.mutate.moveBlockUp({ 40 40 + entityID: block.value, 41 41 + parent: block.listData?.parent || block.parent, 42 42 + }); 43 43 + } 44 44 + }; 45 45 + 46 46 + export const moveBlockDown = async ( 47 47 + rep: Replicache<ReplicacheMutators>, 48 48 + permission_set: string, 49 49 + ) => { 50 50 + let [sortedBlocks, siblings] = await getSortedSelection(rep); 51 51 + if (sortedBlocks.length > 1) return; 52 52 + let block = sortedBlocks[0]; 53 53 + let nextBlock = siblings 54 54 + .slice(siblings.findIndex((s) => s.value === block.value) + 1) 55 55 + .find( 56 56 + (f) => 57 57 + f.listData && 58 58 + block.listData && 59 59 + !f.listData.path.find((f) => f.entity === block.value), 60 60 + ); 61 61 + if ( 62 62 + nextBlock?.listData && 63 63 + block.listData && 64 64 + nextBlock.listData.depth === block.listData.depth - 1 65 65 + ) { 66 66 + if (useUIState.getState().foldedBlocks.includes(nextBlock.value)) 67 67 + useUIState.getState().toggleFold(nextBlock.value); 68 68 + rep?.mutate.moveBlock({ 69 69 + block: block.value, 70 70 + oldParent: block.listData?.parent, 71 71 + newParent: nextBlock.value, 72 72 + position: { type: "first" }, 73 73 + }); 74 74 + } else { 75 75 + rep?.mutate.moveBlockDown({ 76 76 + entityID: block.value, 77 77 + parent: block.listData?.parent || block.parent, 78 78 + permission_set: permission_set, 79 79 + }); 80 80 + } 81 81 + };