From 7f2d2cadb78e34a12bc44ee0fb1dcf0ba073ee49 Mon Sep 17 00:00:00 2001
From: celine <celine@hyperlink.academy>
Date: Wed, 14 Jan 2026 23:26:05 -0500
Subject: [PATCH] Lock is GONE YO

---
 .github/pull_request_template.md              |   1 -
 components/Blocks/Block.tsx                   |  33 +-----
 .../Blocks/BlueskyPostBlock/BlueskyEmpty.tsx  |   4 +-
 components/Blocks/ButtonBlock.tsx             |   5 +-
 components/Blocks/DateTimeBlock.tsx           |   5 +-
 components/Blocks/EmbedBlock.tsx              |   4 +-
 components/Blocks/ExternalLinkBlock.tsx       |   4 +-
 components/Blocks/ImageBlock.tsx              |   5 +-
 components/Blocks/TextBlock/index.tsx         |  10 +-
 components/Blocks/index.tsx                   |   4 +-
 components/Blocks/useBlockKeyboardHandlers.ts |  15 +--
 components/Toolbar/LockBlockButton.tsx        | 103 ------------------
 components/Toolbar/MultiSelectToolbar.tsx     |   8 +-
 components/Toolbar/TextToolbar.tsx            |   3 -
 components/Toolbar/index.tsx                  |  11 +-
 src/replicache/mutations.ts                   |   5 -
 16 files changed, 24 insertions(+), 196 deletions(-)
 delete mode 100644 components/Toolbar/LockBlockButton.tsx

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 127a7e34..441bf8f4 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,5 +2,4 @@ Before you pull, have you made sure...
 - it looks good on both mobile and desktop
 - it undo's like it ought to
 - it handles keyboard interactions reasonably well
-- it behaves as you would expect if you lock it
 - no build errors!!!
diff --git a/components/Blocks/Block.tsx b/components/Blocks/Block.tsx
index 6fc97a4f..62cefd38 100644
--- a/components/Blocks/Block.tsx
+++ b/components/Blocks/Block.tsx
@@ -334,7 +334,6 @@ export const BlockMultiselectIndicator = (props: BlockProps) => {
   let isSelected = useUIState((s) =>
     s.selectedBlocks.find((b) => b.value === props.entityID),
   );
-  let isLocked = useEntity(props.value, "block/is-locked");
 
   let nextBlockSelected = useUIState((s) =>
     s.selectedBlocks.find((b) => b.value === props.nextBlock?.value),
@@ -343,10 +342,7 @@ export const BlockMultiselectIndicator = (props: BlockProps) => {
     s.selectedBlocks.find((b) => b.value === props.previousBlock?.value),
   );
 
-  if (isMultiselected || (isLocked?.data.value && isSelected))
-    // not sure what multiselected and selected classes are doing (?)
-    // use a hashed pattern for locked things. show this pattern if the block is selected, even if it isn't multiselected
-
+  if (isMultiselected)
     return (
       <>
         <div
@@ -359,32 +355,7 @@ export const BlockMultiselectIndicator = (props: BlockProps) => {
           ${!prevBlockSelected && "rounded-t-md"}
           ${!nextBlockSelected && "rounded-b-md"}
           `}
-          style={
-            isLocked?.data.value
-              ? {
-                  maskImage: "var(--hatchSVG)",
-                  maskRepeat: "repeat repeat",
-                }
-              : {}
-          }
-        ></div>
-        {isLocked?.data.value && (
-          <div
-            className={`
-            blockSelectionLockIndicator z-10
-            flex items-center
-            text-border rounded-full
-            absolute right-3
-
-            ${
-              props.type === "heading" || props.type === "text"
-                ? "top-[6px]"
-                : "top-0"
-            }`}
-          >
-            <LockTiny className="bg-bg-page p-0.5 rounded-full w-5 h-5" />
-          </div>
-        )}
+        />
       </>
     );
 };
diff --git a/components/Blocks/BlueskyPostBlock/BlueskyEmpty.tsx b/components/Blocks/BlueskyPostBlock/BlueskyEmpty.tsx
index 33a427ac..2e4703a9 100644
--- a/components/Blocks/BlueskyPostBlock/BlueskyEmpty.tsx
+++ b/components/Blocks/BlueskyPostBlock/BlueskyEmpty.tsx
@@ -18,7 +18,6 @@ export const BlueskyPostEmpty = (props: BlockProps) => {
   let isSelected = useUIState((s) =>
     s.selectedBlocks.find((b) => b.value === props.entityID),
   );
-  let isLocked = useEntity(props.entityID, "block/is-locked")?.data.value;
 
   let entity_set = useEntitySetContext();
   let [urlValue, setUrlValue] = useState("");
@@ -91,7 +90,6 @@ export const BlueskyPostEmpty = (props: BlockProps) => {
           className="w-full grow border-none outline-hidden bg-transparent "
           placeholder="bsky.app/post-url"
           value={urlValue}
-          disabled={isLocked}
           onChange={(e) => setUrlValue(e.target.value)}
           onKeyDown={(e) => {
             if (e.key === "Enter") {
@@ -109,7 +107,7 @@ export const BlueskyPostEmpty = (props: BlockProps) => {
         <button
           type="submit"
           id="bluesky-post-block-submit"
-          className={`p-1 ${isSelected && !isLocked ? "text-accent-contrast" : "text-border"}`}
+          className={`p-1 ${isSelected ? "text-accent-contrast" : "text-border"}`}
           onMouseDown={(e) => {
             e.preventDefault();
             errorSmokers(e.clientX + 12, e.clientY);
diff --git a/components/Blocks/ButtonBlock.tsx b/components/Blocks/ButtonBlock.tsx
index 10574730..ff60196d 100644
--- a/components/Blocks/ButtonBlock.tsx
+++ b/components/Blocks/ButtonBlock.tsx
@@ -56,7 +56,6 @@ const ButtonBlockSettings = (props: BlockProps) => {
   let isSelected = useUIState((s) =>
     s.selectedBlocks.find((b) => b.value === props.entityID),
   );
-  let isLocked = useEntity(props.entityID, "block/is-locked")?.data.value;
 
   let [textValue, setTextValue] = useState("");
   let [urlValue, setUrlValue] = useState("");
@@ -191,7 +190,6 @@ const ButtonBlockSettings = (props: BlockProps) => {
                 className="w-full grow border-none outline-hidden bg-transparent"
                 placeholder="button text"
                 value={textValue}
-                disabled={isLocked}
                 onChange={(e) => setTextValue(e.target.value)}
                 onKeyDown={(e) => {
                   if (
@@ -214,7 +212,6 @@ const ButtonBlockSettings = (props: BlockProps) => {
                 className="w-full grow border-none outline-hidden bg-transparent"
                 placeholder="www.example.com"
                 value={urlValue}
-                disabled={isLocked}
                 onChange={(e) => setUrlValue(e.target.value)}
                 onKeyDown={(e) => {
                   if (e.key === "Backspace" && !e.currentTarget.value)
@@ -225,7 +222,7 @@ const ButtonBlockSettings = (props: BlockProps) => {
             <button
               id="button-block-settings"
               type="submit"
-              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"}`}
+              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"}`}
             >
               <div className="sm:hidden block">Save</div>
               <CheckTiny />
diff --git a/components/Blocks/DateTimeBlock.tsx b/components/Blocks/DateTimeBlock.tsx
index 437b0442..4959299e 100644
--- a/components/Blocks/DateTimeBlock.tsx
+++ b/components/Blocks/DateTimeBlock.tsx
@@ -54,7 +54,6 @@ export function BaseDateTimeBlock(
     s.selectedBlocks.find((b) => b.value === props.entityID),
   );
 
-  let isLocked = !!useEntity(props.entityID, "block/is-locked")?.data.value;
   let alignment = useEntity(props.entityID, "block/text-alignment")?.data.value;
 
   const handleTimeChange: React.ChangeEventHandler<HTMLInputElement> = (e) => {
@@ -118,7 +117,7 @@ export function BaseDateTimeBlock(
 
   return (
     <Popover
-      disabled={isLocked || !permissions.write}
+      disabled={!permissions.write}
       className="w-64 z-10 px-2!"
       trigger={
         <BlockLayout
@@ -134,7 +133,7 @@ export function BaseDateTimeBlock(
             {dateFact ? (
               <div
                 className={`font-bold
-              ${!permissions.write || isLocked ? "" : "group-hover/date:underline"}
+              ${!permissions.write ? "" : "group-hover/date:underline"}
               `}
               >
                 {selectedDate.toLocaleDateString(undefined, {
diff --git a/components/Blocks/EmbedBlock.tsx b/components/Blocks/EmbedBlock.tsx
index c53c1fe5..806fcb1c 100644
--- a/components/Blocks/EmbedBlock.tsx
+++ b/components/Blocks/EmbedBlock.tsx
@@ -129,7 +129,6 @@ const BlockLinkInput = (props: BlockProps) => {
   let isSelected = useUIState((s) =>
     s.selectedBlocks.find((b) => b.value === props.entityID),
   );
-  let isLocked = useEntity(props.entityID, "block/is-locked")?.data.value;
 
   let entity_set = useEntitySetContext();
   let [linkValue, setLinkValue] = useState("");
@@ -250,14 +249,13 @@ const BlockLinkInput = (props: BlockProps) => {
           className="w-full grow border-none outline-hidden bg-transparent "
           placeholder="www.example.com"
           value={linkValue}
-          disabled={isLocked}
           onChange={(e) => setLinkValue(e.target.value)}
         />
         <button
           type="submit"
           id="embed-block-submit"
           disabled={loading}
-          className={`p-1 ${isSelected && !isLocked ? "text-accent-contrast" : "text-border"}`}
+          className={`p-1 ${isSelected ? "text-accent-contrast" : "text-border"}`}
           onMouseDown={(e) => {
             e.preventDefault();
             if (loading) return;
diff --git a/components/Blocks/ExternalLinkBlock.tsx b/components/Blocks/ExternalLinkBlock.tsx
index 33eb17ac..57a92d82 100644
--- a/components/Blocks/ExternalLinkBlock.tsx
+++ b/components/Blocks/ExternalLinkBlock.tsx
@@ -118,7 +118,6 @@ const BlockLinkInput = (props: BlockProps & { preview?: boolean }) => {
   let isSelected = useUIState((s) =>
     s.selectedBlocks.find((b) => b.value === props.entityID),
   );
-  let isLocked = useEntity(props.value, "block/is-locked")?.data.value;
   let entity_set = useEntitySetContext();
   let [linkValue, setLinkValue] = useState("");
   let { rep } = useReplicache();
@@ -173,7 +172,6 @@ const BlockLinkInput = (props: BlockProps & { preview?: boolean }) => {
             !props.preview ? elementId.block(props.entityID).input : undefined
           }
           type="url"
-          disabled={isLocked}
           className="w-full grow border-none outline-hidden bg-transparent "
           placeholder="www.example.com"
           value={linkValue}
@@ -199,7 +197,7 @@ const BlockLinkInput = (props: BlockProps & { preview?: boolean }) => {
         <div className="flex items-center gap-3 ">
           <button
             autoFocus={false}
-            className={`p-1 ${isSelected && !isLocked ? "text-accent-contrast" : "text-border"}`}
+            className={`p-1 ${isSelected ? "text-accent-contrast" : "text-border"}`}
             onMouseDown={(e) => {
               e.preventDefault();
               if (!linkValue || linkValue === "") {
diff --git a/components/Blocks/ImageBlock.tsx b/components/Blocks/ImageBlock.tsx
index bd2bdad8..8623be0b 100644
--- a/components/Blocks/ImageBlock.tsx
+++ b/components/Blocks/ImageBlock.tsx
@@ -28,7 +28,6 @@ export function ImageBlock(props: BlockProps & { preview?: boolean }) {
   let isSelected = useUIState((s) =>
     s.selectedBlocks.find((b) => b.value === props.value),
   );
-  let isLocked = useEntity(props.value, "block/is-locked")?.data.value;
   let isFullBleed = useEntity(props.value, "image/full-bleed")?.data.value;
   let isFirst = props.previousBlock === null;
   let isLast = props.nextBlock === null;
@@ -84,7 +83,7 @@ export function ImageBlock(props: BlockProps & { preview?: boolean }) {
     return (
       <BlockLayout
         hasBackground="accent"
-        isSelected={!!isSelected && !isLocked}
+        isSelected={!!isSelected}
         borderOnHover
         className=" group/image-block text-tertiary hover:text-accent-contrast hover:font-bold h-[104px]  border-dashed rounded-lg"
       >
@@ -101,7 +100,6 @@ export function ImageBlock(props: BlockProps & { preview?: boolean }) {
           onDrop={async (e) => {
             e.preventDefault();
             e.stopPropagation();
-            if (isLocked) return;
             const files = e.dataTransfer.files;
             if (files && files.length > 0) {
               const file = files[0];
@@ -118,7 +116,6 @@ export function ImageBlock(props: BlockProps & { preview?: boolean }) {
             Upload An Image
           </div>
           <input
-            disabled={isLocked}
             className="h-0 w-0 hidden"
             type="file"
             accept="image/*"
diff --git a/components/Blocks/TextBlock/index.tsx b/components/Blocks/TextBlock/index.tsx
index f774469b..3bfd54c0 100644
--- a/components/Blocks/TextBlock/index.tsx
+++ b/components/Blocks/TextBlock/index.tsx
@@ -41,17 +41,13 @@ export function TextBlock(
     preview?: boolean;
   },
 ) {
-  let isLocked = useEntity(props.entityID, "block/is-locked");
   let initialized = useHasPageLoaded();
   let first = props.previousBlock === null;
   let permission = useEntitySetContext().permissions.write;
 
   return (
     <>
-      {(!initialized ||
-        !permission ||
-        props.preview ||
-        isLocked?.data.value) && (
+      {(!initialized || !permission || props.preview) && (
         <RenderedTextBlock
           type={props.type}
           entityID={props.entityID}
@@ -61,7 +57,7 @@ export function TextBlock(
           previousBlock={props.previousBlock}
         />
       )}
-      {permission && !props.preview && !isLocked?.data.value && (
+      {permission && !props.preview && (
         <div
           className={`w-full relative group ${!initialized ? "hidden" : ""}`}
         >
@@ -330,7 +326,6 @@ const BlockifyLink = (props: {
   let { editorState } = props;
   let rep = useReplicache();
   let smoker = useSmoker();
-  let isLocked = useEntity(props.entityID, "block/is-locked");
   let focused = useUIState((s) => s.focusedEntity?.entityID === props.entityID);
 
   let isBlueskyPost =
@@ -340,7 +335,6 @@ const BlockifyLink = (props: {
   // if its bluesky, change text to embed post
 
   if (
-    !isLocked &&
     focused &&
     editorState &&
     betterIsUrl(editorState.doc.textContent) &&
diff --git a/components/Blocks/index.tsx b/components/Blocks/index.tsx
index 6a7414b6..f5d49802 100644
--- a/components/Blocks/index.tsx
+++ b/components/Blocks/index.tsx
@@ -181,11 +181,9 @@ function NewBlockButton(props: { lastBlock: Block | null; entityID: string }) {
       : null,
   );
 
-  let isLocked = useEntity(props.lastBlock?.value || null, "block/is-locked");
   if (!entity_set.permissions.write) return null;
   if (
-    ((props.lastBlock?.type === "text" && !isLocked?.data.value) ||
-      props.lastBlock?.type === "heading") &&
+    (props.lastBlock?.type === "text" || props.lastBlock?.type === "heading") &&
     (!editorState?.editor || editorState.editor.doc.content.size <= 2)
   )
     return null;
diff --git a/components/Blocks/useBlockKeyboardHandlers.ts b/components/Blocks/useBlockKeyboardHandlers.ts
index 38f678a0..6ffb977e 100644
--- a/components/Blocks/useBlockKeyboardHandlers.ts
+++ b/components/Blocks/useBlockKeyboardHandlers.ts
@@ -23,7 +23,6 @@ export function useBlockKeyboardHandlers(
 ) {
   let { rep, undoManager } = useReplicache();
   let entity_set = useEntitySetContext();
-  let isLocked = !!useEntity(props.entityID, "block/is-locked")?.data.value;
 
   let isSelected = useUIState((s) => {
     let selectedBlocks = s.selectedBlocks;
@@ -70,18 +69,16 @@ export function useBlockKeyboardHandlers(
         entity_set,
         areYouSure,
         setAreYouSure,
-        isLocked,
       });
       undoManager.endGroup();
     };
     window.addEventListener("keydown", listener);
     return () => window.removeEventListener("keydown", listener);
-  }, [entity_set, isSelected, props, rep, areYouSure, setAreYouSure, isLocked]);
+  }, [entity_set, isSelected, props, rep, areYouSure, setAreYouSure]);
 }
 
 type Args = {
   e: KeyboardEvent;
-  isLocked: boolean;
   props: BlockProps;
   rep: Replicache<ReplicacheMutators>;
   entity_set: { set: string };
@@ -133,16 +130,8 @@ function ArrowUp({ e, props }: Args) {
 }
 
 let debounced: null | number = null;
-async function Backspace({
-  e,
-  props,
-  rep,
-  areYouSure,
-  setAreYouSure,
-  isLocked,
-}: Args) {
+async function Backspace({ e, props, rep, areYouSure, setAreYouSure }: Args) {
   // if this is a textBlock, let the textBlock/keymap handle the backspace
-  if (isLocked) return;
   // if its an input, label, or teatarea with content, do nothing (do the broswer default instead)
   let el = e.target as HTMLElement;
   if (
diff --git a/components/Toolbar/LockBlockButton.tsx b/components/Toolbar/LockBlockButton.tsx
deleted file mode 100644
index 3fdaa497..00000000
--- a/components/Toolbar/LockBlockButton.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import { useUIState } from "src/useUIState";
-import { ToolbarButton } from ".";
-import { useEntity, useReplicache } from "src/replicache";
-
-import { focusBlock } from "src/utils/focusBlock";
-import { Props } from "components/Icons/Props";
-
-export function LockBlockButton() {
-  let focusedBlock = useUIState((s) => s.focusedEntity);
-  let selectedBlocks = useUIState((s) => s.selectedBlocks);
-  let type = useEntity(focusedBlock?.entityID || null, "block/type");
-  let locked = useEntity(focusedBlock?.entityID || null, "block/is-locked");
-  let { rep } = useReplicache();
-  if (focusedBlock?.entityType !== "block") return;
-  return (
-    <ToolbarButton
-      disabled={false}
-      onClick={async () => {
-        if (!locked?.data.value) {
-          await rep?.mutate.assertFact({
-            entity: focusedBlock.entityID,
-            attribute: "block/is-locked",
-            data: { value: true, type: "boolean" },
-          });
-          if (selectedBlocks.length > 1) {
-            for (let block of selectedBlocks) {
-              await rep?.mutate.assertFact({
-                attribute: "block/is-locked",
-                entity: block.value,
-                data: { value: true, type: "boolean" },
-              });
-            }
-          }
-        } else {
-          await rep?.mutate.retractFact({ factID: locked.id });
-          if (selectedBlocks.length > 1) {
-            for (let block of selectedBlocks) {
-              await rep?.mutate.retractAttribute({
-                attribute: "block/is-locked",
-                entity: block.value,
-              });
-            }
-          } else {
-            type &&
-              focusBlock(
-                {
-                  type: type.data.value,
-                  parent: focusedBlock.parent,
-                  value: focusedBlock.entityID,
-                },
-                { type: "end" },
-              );
-          }
-        }
-      }}
-      tooltipContent={
-        <span>{!locked?.data.value ? "Lock Editing" : " Unlock to Edit"}</span>
-      }
-    >
-      {!locked?.data.value ? <LockSmall /> : <UnlockSmall />}
-    </ToolbarButton>
-  );
-}
-
-const LockSmall = (props: Props) => {
-  return (
-    <svg
-      width="24"
-      height="24"
-      viewBox="0 0 24 24"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      {...props}
-    >
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        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"
-        fill="currentColor"
-      />
-    </svg>
-  );
-};
-
-const UnlockSmall = (props: Props) => {
-  return (
-    <svg
-      width="24"
-      height="24"
-      viewBox="0 0 24 24"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      {...props}
-    >
-      <path
-        fillRule="evenodd"
-        clipRule="evenodd"
-        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"
-        fill="currentColor"
-      />
-    </svg>
-  );
-};
diff --git a/components/Toolbar/MultiSelectToolbar.tsx b/components/Toolbar/MultiSelectToolbar.tsx
index affb41d2..ef2aa833 100644
--- a/components/Toolbar/MultiSelectToolbar.tsx
+++ b/components/Toolbar/MultiSelectToolbar.tsx
@@ -3,14 +3,12 @@ import { ReplicacheMutators, useReplicache } from "src/replicache";
 import { ToolbarButton } from "./index";
 import { copySelection } from "src/utils/copySelection";
 import { useSmoker, useToaster } from "components/Toast";
-import { getBlocksWithType } from "src/hooks/queries/useBlocks";
-import { Replicache } from "replicache";
-import { LockBlockButton } from "./LockBlockButton";
+
 import { Props } from "components/Icons/Props";
 import { TextAlignmentButton } from "./TextAlignmentToolbar";
 import { getSortedSelection } from "components/SelectionManager/selectionState";
 import { deleteBlock } from "src/utils/deleteBlock";
-import { ShortcutKey } from "components/Layout";
+import { Separator, ShortcutKey } from "components/Layout";
 
 export const MultiselectToolbar = (props: {
   setToolbarState: (state: "multiselect" | "text-alignment") => void;
@@ -69,7 +67,7 @@ export const MultiselectToolbar = (props: {
           <CopySmall />
         </ToolbarButton>
         <TextAlignmentButton setToolbarState={props.setToolbarState} />
-        <LockBlockButton />
+        <Separator classname="h-6!" />
       </div>
     </div>
   );
diff --git a/components/Toolbar/TextToolbar.tsx b/components/Toolbar/TextToolbar.tsx
index fb663732..b6663dd5 100644
--- a/components/Toolbar/TextToolbar.tsx
+++ b/components/Toolbar/TextToolbar.tsx
@@ -8,7 +8,6 @@ import { HighlightButton } from "./HighlightToolbar";
 import { ToolbarTypes } from ".";
 import { schema } from "components/Blocks/TextBlock/schema";
 import { TextAlignmentButton } from "./TextAlignmentToolbar";
-import { LockBlockButton } from "./LockBlockButton";
 import { Props } from "components/Icons/Props";
 import { isMac } from "src/utils/isDevice";
 
@@ -81,8 +80,6 @@ export const TextToolbar = (props: {
       <TextAlignmentButton setToolbarState={props.setToolbarState} />
       <ListButton setToolbarState={props.setToolbarState} />
       <Separator classname="h-6!" />
-
-      <LockBlockButton />
     </>
   );
 };
diff --git a/components/Toolbar/index.tsx b/components/Toolbar/index.tsx
index 061d213d..6e0a02d1 100644
--- a/components/Toolbar/index.tsx
+++ b/components/Toolbar/index.tsx
@@ -38,6 +38,7 @@ export const Toolbar = (props: {
   let [toolbarState, setToolbarState] = useState<ToolbarTypes>("default");
 
   let activeEditor = useEditorStates((s) => s.editorStates[props.blockID]);
+  let selectedBlocks = useUIState((s) => s.selectedBlocks);
 
   let lastUsedHighlight = useUIState((s) => s.lastUsedHighlight);
   let setLastUsedHighlight = (color: "1" | "2" | "3") =>
@@ -65,6 +66,10 @@ export const Toolbar = (props: {
     props.blockType === "blockquote";
 
   useEffect(() => {
+    if (selectedBlocks.length > 1) {
+      setToolbarState("multiselect");
+      return;
+    }
     if (isTextBlock) {
       setToolbarState("default");
     }
@@ -74,7 +79,7 @@ export const Toolbar = (props: {
     if (props.blockType === "button" || props.blockType === "datetime") {
       setToolbarState("text-alignment");
     } else null;
-  }, [props.blockType]);
+  }, [props.blockType, selectedBlocks]);
 
   let isMobile = useIsMobile();
   return (
@@ -165,9 +170,7 @@ export const ToolbarButton = (props: {
   hiddenOnCanvas?: boolean;
 }) => {
   let focusedEntity = useUIState((s) => s.focusedEntity);
-  let isLocked = useEntity(focusedEntity?.entityID || null, "block/is-locked");
-  let isDisabled =
-    props.disabled === undefined ? !!isLocked?.data.value : props.disabled;
+  let isDisabled = props.disabled;
 
   let focusedEntityType = useEntity(
     focusedEntity?.entityType === "page"
diff --git a/src/replicache/mutations.ts b/src/replicache/mutations.ts
index 4b57d64b..3bc9ffdd 100644
--- a/src/replicache/mutations.ts
+++ b/src/replicache/mutations.ts
@@ -308,11 +308,6 @@ const removeBlock: Mutation<
   { blockEntity: string } | { blockEntity: string }[]
 > = async (args, ctx) => {
   for (let block of [args].flat()) {
-    let [isLocked] = await ctx.scanIndex.eav(
-      block.blockEntity,
-      "block/is-locked",
-    );
-    if (isLocked?.data.value) continue;
     let [image] = await ctx.scanIndex.eav(block.blockEntity, "block/image");
     await ctx.runOnServer(async ({ supabase }) => {
       if (image) {
-- 
2.51.2