From 417f3fab67b4a6f880daf83aa37897352c9f133f Mon Sep 17 00:00:00 2001
From: Giovane Cardoso <novout@hotmail.com>
Date: Wed, 4 May 2022 12:51:46 -0300
Subject: [PATCH] chore(editor): emitter options rewrite

---
 .../default/EditorEntityDefaultInput.vue      | 896 ------------------
 .../EditorEntityDefaultInputSelect.vue        |   8 -
 .../blocks/EditorEntityDefaultCheckbox.vue    |   2 +-
 .../blocks/EditorEntityDefaultHeading.vue     |   5 +-
 .../blocks/EditorEntityDefaultList.vue        |   2 +-
 .../blocks/EditorEntityDefaultParagraph.vue   |   2 +-
 .../blocks/EditorEntityDefaultText.vue        |  83 +-
 .../options/EditorEntityDefaultOptions.vue    |  16 +-
 .../EditorEntityDefaultOptionsItem.vue        |   4 -
 packages/better-write-app/src/main.ts         |   6 +-
 .../better-write-app/src/store/context.ts     |   2 +-
 packages/better-write-app/src/use/editor.ts   |   8 +-
 packages/better-write-app/src/use/emitter.ts  |   5 +-
 packages/better-write-app/src/use/entity.ts   | 152 +--
 packages/better-write-app/src/use/page.ts     |   6 -
 packages/better-write-app/src/use/raw.ts      |  39 +-
 .../src/use/storage/storage.ts                |   2 -
 .../better-write-types/src/types/emitter.ts   |  42 +-
 18 files changed, 142 insertions(+), 1138 deletions(-)
 delete mode 100644 packages/better-write-app/src/components/page/editor/entity/default/EditorEntityDefaultInput.vue
 delete mode 100644 packages/better-write-app/src/components/page/editor/entity/default/EditorEntityDefaultInputSelect.vue

diff --git a/packages/better-write-app/src/components/page/editor/entity/default/EditorEntityDefaultInput.vue b/packages/better-write-app/src/components/page/editor/entity/default/EditorEntityDefaultInput.vue
deleted file mode 100644
index ef1d2c787..000000000
--- a/packages/better-write-app/src/components/page/editor/entity/default/EditorEntityDefaultInput.vue
+++ /dev/null
@@ -1,896 +0,0 @@
-<template>
-  <section
-    class="w-full relative"
-    :class="style.entity.shadow ? 'shadow-winset p-0 m-0' : ''"
-    @mouseenter="hover = true"
-    @mouseleave="hover = false"
-    @click="onClickInEntity"
-  >
-    <section
-      v-if="EDITOR.configuration.entity.updateTime && hover"
-      class="absolute top-0 text-xs wb-text"
-    >
-      {{ update }}
-    </section>
-    <section v-if="commands" class="absolute z-max left-40 -top-60">
-      <EditorCommands />
-    </section>
-    <div
-      ref="input"
-      :contenteditable="editable"
-      :spellcheck="true"
-      :data-placeholder="
-        entity.utils().isFixed(_index)
-          ? ''
-          : focused
-          ? t('editor.text.placeholder.base', {
-              prefix: EDITOR.configuration.commands.prefix,
-            })
-          : ''
-      "
-      :style="{
-        minHeight: '24px',
-        whiteSpace: 'pre-line',
-        paddingBottom: last ? '5rem' : '',
-        textIndent: props.entity.type === 'paragraph' ? '2rem' : 0,
-      }"
-      :class="raw.v2().block().style(props.entity, 'input')"
-      @input="onInput"
-      @keypress.enter.prevent="onEnter"
-      @keydown="onKeyboard"
-      @click="onClick"
-      @paste="entity.base().onPaste(props.entity, data, $event, input as HTMLInputElement)"
-      @copy="raw.v2().copy()"
-      v-html="raw.v2().purge().editor(props.entity)"
-    />
-  </section>
-</template>
-
-<script setup lang="ts">
-  import { ref, watch, nextTick, computed, onMounted } from 'vue'
-  import { useRaw } from '@/use/raw'
-  import useEmitter from '@/use/emitter'
-  import { useEnv } from '@/use/env'
-  import { useEntity } from '@/use/entity'
-  import { useFactory } from '@/use/factory'
-  import { useToast } from 'vue-toastification'
-  import { useI18n } from 'vue-i18n'
-  import { useScroll } from '@/use/scroll'
-  import { useContextStore } from '@/store/context'
-  import { useProjectStore } from '@/store/project'
-  import { useEditorStore } from '@/store/editor'
-  import { useAbsoluteStore } from '@/store/absolute'
-  import { usePlugin } from 'better-write-plugin-core'
-  import {
-    ID,
-    Entity,
-    EntityShowEditOptions,
-    VueEmitterEntityOpen,
-    VueEmitterEntityClose,
-  } from 'better-write-types'
-  import { useUtils } from '@/use/utils'
-  import { useFocus } from '@vueuse/core'
-  import { useFormat } from '@/use/format'
-  import { useProject } from '@/use/project'
-
-  const props = defineProps({
-    entity: {
-      required: true,
-      type: Object as () => Entity,
-    },
-  })
-
-  const CONTEXT = useContextStore()
-  const PROJECT = useProjectStore()
-  const EDITOR = useEditorStore()
-  const ABSOLUTE = useAbsoluteStore()
-
-  const toast = useToast()
-  const emitter = useEmitter()
-  const env = useEnv()
-  const entity = useEntity()
-  const factory = useFactory()
-  const scroll = useScroll()
-  const { t } = useI18n()
-  const raw = useRaw()
-  const plugin = usePlugin()
-  const format = useFormat()
-  const project = useProject()
-
-  const hover = ref<boolean>(false)
-  const focus = ref<boolean>(false)
-  const edit = ref<boolean>(false)
-  const commands = ref<boolean>(false)
-  const old_raw = ref<number>(props.entity.raw.length)
-  const press = ref<boolean>(false)
-
-  const data = ref<string>('')
-  const input = ref<HTMLInputElement | null>(null)
-  const keyboard = ref<boolean>(false)
-
-  const style = computed(() => EDITOR.styles.show)
-  const _index = computed(() => CONTEXT.entities.indexOf(props.entity))
-  const editable = computed(() => !entity.utils().isFixed(_index.value))
-  const last = computed(() => _index.value === CONTEXT.entities.length - 1)
-  const update = computed(() => format.lastTime(props.entity.updatedAt))
-  const target = computed(
-    () => EDITOR.actives.entity.index === _index.value && ABSOLUTE.entity.menu
-  )
-  const { focused } = useFocus(input)
-
-  watch(props.entity, () => {
-    // new entity properties
-    onReset()
-  })
-
-  watch(focused, (_focused) => {
-    if (_focused && !entity.utils().isFixed(_index.value)) {
-      EDITOR.actives.entity.index = _index.value
-
-      if (ABSOLUTE.tools.speechRecognition) {
-        project.utils().resetAllVisual()
-
-        CONTEXT.entities[_index.value].visual.warning = true
-      }
-    }
-  })
-
-  watch(hover, async (_hover) => {
-    emitter.emit('entity-hover', _hover)
-
-    await nextTick
-    if (_hover) {
-      onEdit()
-    } else {
-      keyboard.value = false
-    }
-  })
-
-  watch(edit, async (_edit) => {
-    await nextTick
-
-    if (_edit) {
-      if (!hover.value || keyboard.value)
-        raw
-          .v2()
-          .caret()
-          .set(input.value as any, input.value?.innerHTML.length as any)
-
-      if (last.value) scroll.entity(_index.value, 'bottom')
-
-      entity.utils().isFixedRaw(props.entity.raw)
-        ? (data.value = '')
-        : (data.value = props.entity.raw)
-
-      emitter.emit('entity-close', props.entity)
-    } else {
-      focus.value = false
-    }
-  })
-
-  watch(target, (_target) => {
-    // for delete mutate
-    if (!CONTEXT.entities[_index.value]) return
-
-    CONTEXT.entities[_index.value].visual.info = _target
-  })
-
-  const setData = (val: string) => {
-    const _input = input.value as HTMLDivElement
-
-    if (val === null) return
-
-    data.value = val
-    _input.innerHTML = val
-  }
-
-  watch(data, async (_data: string) => {
-    const _last = last.value
-
-    data.value = data.value.replace(/\n/g, '')
-
-    if (
-      _data === env.emptyLine() ||
-      _data === env.lineBreak() ||
-      _data === env.pageBreak()
-    ) {
-      setData('')
-    }
-
-    plugin.emit('plugin-input-watch-initial', {
-      data: _data.replace(props.entity.raw, ''),
-      index: _index.value,
-    })
-
-    if (
-      data.value.startsWith(EDITOR.configuration.commands.prefix) &&
-      data.value.length <= EDITOR.configuration.commands.prefix.length + 1
-    ) {
-      scroll.entity(_index.value, 'center')
-      commands.value = true
-    } else {
-      commands.value = false
-      if (last.value) scroll.entity(_index.value, 'bottom')
-    }
-
-    if (
-      entity
-        .utils()
-        .entry(_data, EDITOR.configuration.commands.paragraph.prefix)
-    ) {
-      setData('')
-
-      CONTEXT.newInExistentEntity({
-        old: props.entity,
-        new: factory.entity().create('paragraph'),
-      })
-
-      await nextTick
-
-      input.value?.focus()
-    } else if (
-      entity
-        .utils()
-        .entry(_data, EDITOR.configuration.commands.headingTwo.prefix)
-    ) {
-      setData('')
-
-      CONTEXT.newInExistentEntity({
-        old: props.entity,
-        new: factory.entity().create('heading-two'),
-      })
-
-      await nextTick
-
-      input.value?.focus()
-    } else if (
-      entity
-        .utils()
-        .entry(_data, EDITOR.configuration.commands.headingThree.prefix)
-    ) {
-      setData('')
-
-      CONTEXT.newInExistentEntity({
-        old: props.entity,
-        new: factory.entity().create('heading-three'),
-      })
-
-      await nextTick
-
-      input.value?.focus()
-    } else if (
-      entity
-        .utils()
-        .entry(_data, EDITOR.configuration.commands.pageBreak.prefix)
-    ) {
-      setData('')
-
-      CONTEXT.newInExistentEntity({
-        old: props.entity,
-        new: factory.entity().create('page-break'),
-      })
-
-      if (_last) {
-        await nextTick
-
-        CONTEXT.newInPagePosEdit({
-          entity: props.entity,
-          type: 'paragraph',
-          raw: data.value,
-        })
-
-        await nextTick
-
-        emitter.emit('entity-not-mutate-down', props.entity)
-
-        await nextTick
-
-        input.value?.focus()
-      }
-    } else if (
-      entity
-        .utils()
-        .entry(_data, EDITOR.configuration.commands.lineBreak.prefix)
-    ) {
-      setData('')
-
-      CONTEXT.newInExistentEntity({
-        old: props.entity,
-        new: factory.entity().create('line-break'),
-      })
-
-      if (_last) {
-        await nextTick
-
-        CONTEXT.newInPagePosEdit({
-          entity: props.entity,
-          type: 'paragraph',
-          raw: data.value,
-        })
-
-        await nextTick
-
-        emitter.emit('entity-not-mutate-down', props.entity)
-      }
-
-      await nextTick
-
-      PROJECT.updateContext(CONTEXT.$state)
-    } else if (
-      entity.utils().entry(_data, EDITOR.configuration.commands.image.prefix)
-    ) {
-      setData('')
-
-      factory.simulate().file(
-        async (content: Entity) => {
-          edit.value = false
-
-          CONTEXT.newInExistentEntity({
-            old: props.entity,
-            new: content,
-          })
-
-          if (_last) {
-            await nextTick
-
-            CONTEXT.newInPagePosEdit({
-              entity: props.entity,
-              type: 'paragraph',
-              raw: data.value,
-            })
-
-            await nextTick
-
-            emitter.emit('entity-not-mutate-down', props.entity)
-          }
-
-          await nextTick
-
-          PROJECT.updateContext(CONTEXT.$state)
-        },
-        () => {
-          toast.error(t('toast.generics.error'))
-        }
-      )
-    } else if (
-      entity.utils().entry(_data, EDITOR.configuration.commands.checkbox.prefix)
-    ) {
-      setData('')
-
-      CONTEXT.newInExistentEntity({
-        old: props.entity,
-        new: factory.entity().create('checkbox'),
-      })
-    } else if (
-      entity.utils().entry(_data, EDITOR.configuration.commands.list.prefix)
-    ) {
-      setData('')
-
-      CONTEXT.newInExistentEntity({
-        old: props.entity,
-        new: factory.entity().create('list'),
-      })
-
-      return
-    } else if (
-      entity.utils().entry(_data, EDITOR.configuration.commands.drau.prefix)
-    ) {
-      setData('')
-
-      CONTEXT.newInExistentEntity({
-        old: props.entity,
-        new: factory.entity().create('drau'),
-      })
-
-      await nextTick
-
-      if (_last) CONTEXT.newInPageInLastPosition('paragraph')
-
-      return
-    }
-
-    const dialogue =
-      EDITOR.configuration.commands.prefix +
-      EDITOR.configuration.commands.dialogue.prefix
-
-    if (_data.includes(dialogue)) {
-      const offset = _data.indexOf(dialogue) + dialogue.length
-      const sub = _data.replace(
-        dialogue,
-        EDITOR.configuration.commands.dialogue.value
-      )
-
-      setData(sub)
-
-      // for paste and other utilities correct workflow focus
-      PROJECT.offsetLoaded = offset
-
-      raw
-        .v2()
-        .caret()
-        .set(input.value as HTMLDivElement, offset, true)
-    }
-  })
-
-  onMounted(() => {
-    emitter.on('entity-reset', async () => {
-      await nextTick
-
-      onReset()
-    })
-
-    emitter.on(
-      'entity-close',
-      (ent?: Entity, options?: VueEmitterEntityClose) => {
-        if (document.activeElement === input.value) return
-
-        if (options?.all) {
-          onUpdateContent()
-          return
-        }
-
-        if (!ent) return
-
-        const index = CONTEXT.entities.indexOf(ent)
-
-        if (CONTEXT.entities[index] === props.entity) return
-
-        if (edit.value) onUpdateContent()
-      }
-    )
-
-    emitter.on('entity-open', async (payload: VueEmitterEntityOpen) => {
-      keyboard.value = false
-      const index = CONTEXT.entities.indexOf(payload.entity)
-
-      if (payload?.up && CONTEXT.entities[index - 1] === props.entity) {
-        if (payload.keyboard) keyboard.value = true
-
-        onEdit(undefined, {
-          keyboard: true,
-          selectionInitial: payload?.selectionInitial,
-          switch: payload?.switch,
-          cursor: payload?.cursor,
-        })
-      }
-
-      if (!payload?.up && CONTEXT.entities[index + 1] === props.entity) {
-        if (payload.keyboard) keyboard.value = true
-
-        onEdit(undefined, {
-          keyboard: true,
-          selectionInitial: payload?.selectionInitial,
-          switch: payload?.switch,
-          cursor: payload?.cursor,
-        })
-      }
-    })
-
-    emitter.on('entity-open-by-index', (index: ID<number>) => {
-      if (CONTEXT.entities[index] === props.entity) {
-        onEdit()
-        return
-      }
-    })
-
-    emitter.on('entity-scroll-by-index', async (index: ID<number>) => {
-      if (CONTEXT.entities[index] === props.entity) {
-        await nextTick
-        scroll.to(`#entity-${index}`, 'center')
-      }
-    })
-
-    emitter.on('entity-focus', () => {
-      if (document.activeElement === input.value) return
-
-      focus.value = false
-      edit.value = false
-    })
-
-    emitter.on('entity-open-last', () => {
-      const length = CONTEXT.entities.length
-      const entity = CONTEXT.entities[length - 1]
-
-      if (entity === props.entity) {
-        onEdit()
-      }
-    })
-
-    emitter.on('entity-not-mutate', async (entity: Entity) => {
-      onReset()
-
-      await nextTick
-
-      const _id = CONTEXT.entities.indexOf(entity)
-
-      if (CONTEXT.entities[_id - 1] === props.entity) {
-        keyboard.value = true
-
-        onEdit()
-      }
-    })
-
-    emitter.on('entity-not-mutate-down', async (entity: Entity) => {
-      onReset()
-
-      await nextTick
-
-      const _id = CONTEXT.entities.indexOf(entity)
-
-      if (CONTEXT.entities[_id + 1] === props.entity) {
-        keyboard.value = true
-        onEdit()
-      }
-    })
-
-    emitter.on('project-save', () => {
-      emitter.emit('entity-close', { all: true })
-    })
-
-    emitter.on('entity-edit-save', async () => {
-      if (edit.value) {
-        edit.value = false
-        await nextTick
-
-        onUpdateContent()
-
-        if (data.value !== props.entity.raw && data.value) {
-          plugin.emit('plugin-entity-create', {
-            data: data.value,
-            index: _index.value,
-          })
-        }
-      }
-    })
-
-    emitter.on('entity-speech-recognition', async ({ id, result }) => {
-      if (CONTEXT.entities[id] === props.entity && input.value) {
-        const _data = data.value
-
-        setData(result)
-
-        await nextTick
-
-        if (result !== _data) onUpdateContent()
-      }
-    })
-  })
-
-  const onUpdateContent = async () => {
-    if (props.entity.raw === data.value) return
-
-    CONTEXT.updateInPage({
-      entity: props.entity,
-      raw: !data.value ? env.emptyLine() : data.value,
-    })
-
-    await nextTick
-
-    PROJECT.updateContext(CONTEXT.$state)
-
-    if (!focus.value) edit.value = false
-  }
-
-  const onEdit = async (e?: MouseEvent, options?: EntityShowEditOptions) => {
-    onStopEvents(e)
-
-    if (
-      props.entity.type === 'page-break' ||
-      props.entity.type === 'line-break' ||
-      props.entity.type === 'image'
-    ) {
-      emitter.emit('entity-close', { all: true })
-      return
-    }
-
-    if (options?.keyboard) {
-      emitter.emit('entity-focus')
-    }
-
-    await nextTick
-
-    edit.value = true
-
-    await nextTick
-
-    if (options?.cursor) {
-      // set cursor in max old content position
-      raw
-        .v2()
-        .caret()
-        .set(input.value as HTMLDivElement, props.entity.raw.length)
-
-      // update old raw
-      old_raw.value = data.value.length
-    }
-  }
-
-  // necessary for mutate context entities
-  const onReset = () => {
-    hover.value = false
-    focus.value = false
-    edit.value = false
-    commands.value = false
-    old_raw.value = props.entity.raw.length
-    press.value = false
-    data.value = ''
-    keyboard.value = false
-  }
-
-  const onEnter = async () => {
-    const _input = input.value as HTMLDivElement
-
-    const position = raw.v2().caret().index(_input)
-    const end = raw.v2().caret().end(_input)
-    const start = raw.v2().caret().start(_input)
-
-    const posRaw = data.value.slice(position)
-
-    let initial = false
-
-    if (end) {
-      CONTEXT.newInPagePosEdit({
-        entity: props.entity,
-        type:
-          props.entity.type === 'heading-one' ? 'paragraph' : props.entity.type,
-      })
-
-      plugin.emit('plugin-entity-create-empty', _index.value + 1)
-    } else {
-      if (start) {
-        CONTEXT.newInPagePosEdit({
-          entity: props.entity,
-          type: 'paragraph',
-          raw: data.value,
-        })
-
-        plugin.emit('plugin-entity-page-break', {
-          data: data.value,
-          index: _index.value + 1,
-        })
-
-        setData(env.emptyLine() as string)
-
-        initial = true
-      } else {
-        setData(data.value.replace(posRaw, ''))
-
-        CONTEXT.newInPagePosEdit({
-          entity: props.entity,
-          type: 'paragraph',
-          raw: posRaw,
-        })
-
-        plugin.emit('plugin-entity-page-break', {
-          data: posRaw,
-          index: _index.value,
-        })
-
-        initial = true
-      }
-    }
-
-    await nextTick
-
-    onUpdateContent()
-
-    await nextTick
-
-    emitter.emit('entity-open', {
-      entity: props.entity,
-      up: false,
-      keyboard: true,
-      selectionInitial: initial,
-    })
-  }
-
-  const onKeyboard = async (e: KeyboardEvent) => {
-    const _input = input.value as HTMLDivElement
-
-    const value = raw.v2().caret().value(_input)
-    // const position = raw.v2().caret().index(_input)
-    const end = raw.v2().caret().end(_input)
-    const start = raw.v2().caret().start(_input)
-    // const empty = raw.v2().caret().empty(_input)
-    const offset = useUtils().cursor().getCurrentCursorPosition(_input)
-
-    if (e.shiftKey) {
-      if (e.key === 'ArrowUp') {
-        // to up
-        e.preventDefault()
-        e.stopPropagation()
-
-        entity.base().onUp(props.entity, _index.value)
-      } else if (e.key === 'ArrowDown') {
-        // to down
-        e.preventDefault()
-        e.stopPropagation()
-
-        entity.base().onDown(props.entity, _index.value)
-      }
-
-      return
-    }
-
-    // in ctrl press
-    if (e.ctrlKey) {
-      // finder
-      if (e.key === 'f' || e.key === 'F') {
-        e.preventDefault()
-        e.stopPropagation()
-
-        ABSOLUTE.shortcuts.finder = true
-      }
-
-      // swapper
-      if (e.key === 'h' || e.key === 'H') {
-        e.preventDefault()
-        e.stopPropagation()
-
-        ABSOLUTE.shortcuts.switcher = true
-      }
-
-      // delete entity
-      if (e.key === 'd' || e.key === 'D') {
-        e.preventDefault()
-        e.stopPropagation()
-
-        entity.base().onDelete(props.entity, _index.value)
-
-        await nextTick
-
-        emitter.emit('entity-reset')
-      }
-
-      // italic entity
-      if (e.key === 'i' || e.key === 'I') {
-        if (!value || props.entity.type !== 'paragraph') return
-
-        e.preventDefault()
-        e.stopPropagation()
-
-        setData(
-          raw
-            .v2()
-            .apply({ existent: data.value, type: 'italic', input: _input })
-        )
-
-        await nextTick
-
-        raw.v2().caret().set(_input, offset)
-      }
-
-      // bold entity
-      if (e.key === 'b' || e.key === 'B') {
-        if (!value || props.entity.type !== 'paragraph') return
-
-        e.preventDefault()
-        e.stopPropagation()
-
-        setData(
-          raw.v2().apply({ existent: data.value, type: 'bold', input: _input })
-        )
-
-        await nextTick
-
-        raw.v2().caret().set(_input, offset)
-      }
-
-      // to entity initial
-      if (e.key === 'ArrowUp') {
-        e.preventDefault()
-        e.stopPropagation()
-
-        entity.base().onUpCursor(props.entity)
-      } else if (e.key === 'ArrowDown') {
-        e.preventDefault()
-        e.stopPropagation()
-
-        entity.base().onDownCursor(props.entity)
-      }
-
-      return
-    }
-    // delete in empty raw or convert
-    if ((e.key === 'Delete' || e.key === 'Backspace') && start) {
-      e.preventDefault()
-      e.stopPropagation()
-
-      entity.base().onDeleteRaw({
-        index: _index.value,
-        data: data.value,
-        entity: props.entity,
-      })
-
-      if (_index.value <= 1) return
-
-      if (entity.utils().isFixed(_index.value - 1)) return
-
-      entity.base().onDelete(props.entity, _index.value)
-
-      await nextTick
-
-      emitter.emit('entity-reset')
-
-      await nextTick
-
-      emitter.emit('entity-open', {
-        entity: props.entity,
-        up: true,
-        cursor: true,
-        keyboard: true,
-      })
-    } else if (e.key === 'ArrowUp') {
-      // to top
-      if (start) {
-        if (
-          props.entity.type === 'heading-one' ||
-          entity.utils().isFixed(_index.value - 1)
-        )
-          return
-
-        emitter.emit('entity-edit-save')
-
-        await nextTick
-
-        emitter.emit('entity-open', {
-          entity: props.entity,
-          up: true,
-          keyboard: true,
-        })
-      }
-    } else if (e.key === 'ArrowDown') {
-      // to bottom
-      if (end) {
-        if (entity.utils().isFixed(_index.value + 1)) return
-
-        emitter.emit('entity-edit-save')
-
-        await nextTick
-
-        emitter.emit('entity-open', {
-          entity: props.entity,
-          up: false,
-          keyboard: true,
-        })
-      }
-    }
-  }
-
-  const onClickInEntity = async (e: MouseEvent) => {
-    onStopEvents(e)
-
-    if (entity.utils().isFixed(_index.value)) return
-
-    edit.value = true
-
-    await nextTick
-
-    input.value?.focus()
-  }
-
-  const onStopEvents = (e?: Event) => {
-    e?.stopPropagation()
-    e?.preventDefault()
-  }
-
-  const onClick = async () => {
-    if (press.value) return
-
-    onStopEvents()
-
-    focus.value = true
-
-    await nextTick
-
-    emitter.emit('entity-close', { all: true })
-
-    await nextTick
-
-    emitter.emit('entity-focus')
-  }
-
-  const onInput = (e: any) => {
-    data.value = e.target.innerHTML
-  }
-</script>
diff --git a/packages/better-write-app/src/components/page/editor/entity/default/EditorEntityDefaultInputSelect.vue b/packages/better-write-app/src/components/page/editor/entity/default/EditorEntityDefaultInputSelect.vue
deleted file mode 100644
index b15220028..000000000
--- a/packages/better-write-app/src/components/page/editor/entity/default/EditorEntityDefaultInputSelect.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<template>
-  <button
-    class="flex items-center justify-between p-1 text-theme-editor-entity-popover-text hover:text-theme-editor-entity-popover-text-hover active:text-theme-editor-entity-popover-text-active w-full hover:bg-theme-editor-entity-popover-background-hover active:bg-theme-editor-entity-popover-background-active"
-  >
-    <slot name="icon"></slot>
-    <p class="px-1 text-sm"><slot></slot></p>
-  </button>
-</template>
diff --git a/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultCheckbox.vue b/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultCheckbox.vue
index 1e30972ab..ffc86fd0a 100644
--- a/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultCheckbox.vue
+++ b/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultCheckbox.vue
@@ -6,7 +6,7 @@
     >
       <div class="w-5" />
       <InputBoolean v-model="select" :specific="true" />
-      <EditorEntityDefaultInput :entity="entity" />
+      <EditorEntityDefaultText :is-attached="true" :entity="props.entity" />
     </section>
   </EditorEntityDefaultContainer>
 </template>
diff --git a/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultHeading.vue b/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultHeading.vue
index 823106615..76a9ab0aa 100644
--- a/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultHeading.vue
+++ b/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultHeading.vue
@@ -50,6 +50,9 @@
 
     await nextTick
 
-    emitter.emit('entity-text-focus', _index.value + 1)
+    emitter.emit('entity-text-focus', {
+      target: _index.value + 1,
+      position: 'auto',
+    })
   }
 </script>
diff --git a/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultList.vue b/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultList.vue
index 889605943..86911a189 100644
--- a/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultList.vue
+++ b/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultList.vue
@@ -10,7 +10,7 @@
         class="h-1 w-1 p-1 bg-theme-background-3 rounded-full"
         :class="[last ? 'mt-2.5' : '']"
       ></div>
-      <EditorEntityDefaultInput :entity="props.entity" />
+      <EditorEntityDefaultText :is-attached="true" :entity="props.entity" />
     </section>
   </EditorEntityDefaultContainer>
 </template>
diff --git a/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultParagraph.vue b/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultParagraph.vue
index f24839aa7..a1432a6ba 100644
--- a/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultParagraph.vue
+++ b/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultParagraph.vue
@@ -1,6 +1,6 @@
 <template>
   <EditorEntityDefaultContainer :entity="props.entity">
-    <EditorEntityDefaultText :entity="props.entity" />
+    <EditorEntityDefaultText :is-attached="false" :entity="props.entity" />
   </EditorEntityDefaultContainer>
 </template>
 
diff --git a/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultText.vue b/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultText.vue
index 07edf00d2..84e632ce3 100644
--- a/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultText.vue
+++ b/packages/better-write-app/src/components/page/editor/entity/default/blocks/EditorEntityDefaultText.vue
@@ -5,7 +5,8 @@
   <div class="relative w-full">
     <p
       ref="__INPUT__"
-      class="editable indent-8 whitespace-pre-line text-justify text-theme-editor-entity-text hover:text-theme-editor-entity-text-hover active:text-theme-editor-entity-text-active"
+      :class="!isAttached ? 'indent-8' : ''"
+      class="editable whitespace-pre-line text-justify text-theme-editor-entity-text hover:text-theme-editor-entity-text-hover active:text-theme-editor-entity-text-active"
       :spellcheck="true"
       :contenteditable="true"
       :data-placeholder="
@@ -17,6 +18,7 @@
       "
       @input="onInput"
       @keydown="onKeyboard"
+      @keypress.enter="onEnter"
       v-html="raw.v2().purge().editor(props.entity)"
     />
   </div>
@@ -30,7 +32,7 @@
   import { useFocus } from '@vueuse/core'
   import { useI18n } from 'vue-i18n'
   import { useContextStore } from '@/store/context'
-  import { Entity, ID } from 'better-write-types'
+  import { Entity } from 'better-write-types'
   import { useRaw } from '@/use/raw'
   import { useAbsoluteStore } from '@/store/absolute'
   import { useProject } from '@/use/project'
@@ -39,6 +41,7 @@
 
   const props = defineProps<{
     entity: Entity
+    isAttached: boolean
   }>()
 
   const EDITOR = useEditorStore()
@@ -71,6 +74,7 @@
       }
     }
 
+    /* save block */
     if (!_focused) {
       block.save(_index.value, __INPUT__.value.innerHTML)
 
@@ -79,11 +83,30 @@
   })
 
   onMounted(() => {
-    emitter.on('entity-text-focus', (index: ID<number>) => {
-      if (CONTEXT.entities[index] === props.entity) {
-        __INPUT__.value?.focus()
+    emitter.on(
+      'entity-text-focus',
+      async ({ target, position, positionOffset }) => {
+        if (CONTEXT.entities[target] === props.entity) {
+          switch (position) {
+            case 'start':
+              raw.v2().caret().set(__INPUT__.value, 0)
+              break
+            case 'end':
+              raw.v2().caret().setEnd(__INPUT__.value)
+              break
+            case 'offset':
+              raw
+                .v2()
+                .caret()
+                .set(__INPUT__.value, positionOffset as number)
+              break
+            case 'auto':
+              __INPUT__.value?.focus()
+              break
+          }
+        }
       }
-    })
+    )
 
     emitter.on('entity-text-force-save', () => {
       if (isSalvageable.value && __INPUT__.value && __INPUT__.value.innerHTML) {
@@ -154,10 +177,6 @@
         e.stopPropagation()
 
         entity.base().onDelete(props.entity, _index.value)
-
-        await nextTick
-
-        emitter.emit('entity-reset')
       }
 
       // italic entity
@@ -205,12 +224,12 @@
         e.preventDefault()
         e.stopPropagation()
 
-        entity.base().onUpCursor(props.entity)
+        // entity.base().onUpCursor(props.entity)
       } else if (e.key === 'ArrowDown') {
         e.preventDefault()
         e.stopPropagation()
 
-        entity.base().onDownCursor(props.entity)
+        // entity.base().onDownCursor(props.entity)
       }
 
       return
@@ -231,19 +250,6 @@
       if (entity.utils().isFixed(_index.value - 1)) return
 
       entity.base().onDelete(props.entity, _index.value)
-
-      await nextTick
-
-      emitter.emit('entity-reset')
-
-      await nextTick
-
-      emitter.emit('entity-open', {
-        entity: props.entity,
-        up: true,
-        cursor: true,
-        keyboard: true,
-      })
     } else if (e.key === 'ArrowUp') {
       // to top
       if (start) {
@@ -252,32 +258,19 @@
           entity.utils().isFixed(_index.value - 1)
         )
           return
-
-        emitter.emit('entity-edit-save')
-
-        await nextTick
-
-        emitter.emit('entity-open', {
-          entity: props.entity,
-          up: true,
-          keyboard: true,
-        })
       }
     } else if (e.key === 'ArrowDown') {
       // to bottom
       if (end) {
         if (entity.utils().isFixed(_index.value + 1)) return
-
-        emitter.emit('entity-edit-save')
-
-        await nextTick
-
-        emitter.emit('entity-open', {
-          entity: props.entity,
-          up: false,
-          keyboard: true,
-        })
       }
     }
   }
+
+  const onEnter = (e: KeyboardEvent) => {
+    if (props.isAttached) {
+      e.preventDefault()
+      e.stopPropagation()
+    }
+  }
 </script>
diff --git a/packages/better-write-app/src/components/page/editor/entity/default/options/EditorEntityDefaultOptions.vue b/packages/better-write-app/src/components/page/editor/entity/default/options/EditorEntityDefaultOptions.vue
index bba745741..19cdc704a 100644
--- a/packages/better-write-app/src/components/page/editor/entity/default/options/EditorEntityDefaultOptions.vue
+++ b/packages/better-write-app/src/components/page/editor/entity/default/options/EditorEntityDefaultOptions.vue
@@ -209,6 +209,7 @@
   import useEmitter from '@/use/emitter'
   import { useFactory } from '@/use/factory'
   import { usePlugin } from 'better-write-plugin-core'
+  import { useEntity } from '@/use/entity'
 
   const EDITOR = useEditorStore()
   const ABSOLUTE = useAbsoluteStore()
@@ -217,6 +218,7 @@
   const entity = computed<Entity>(
     () => CONTEXT.entities[EDITOR.actives.entity.index]
   )
+  const _index = computed(() => CONTEXT.entities.indexOf(entity.value))
   const options = ref<HTMLElement | null>(null)
   const visible = ref<boolean>(false)
   const block = ref<boolean>(false)
@@ -225,6 +227,7 @@
   const emitter = useEmitter()
   const plugin = usePlugin()
   const factory = useFactory()
+  const ent = useEntity()
 
   onClickOutside(options as any, () => onClose())
 
@@ -272,8 +275,8 @@
     ABSOLUTE.entity.menu = false
   }
 
-  const onDeleteEntity = () => {
-    CONTEXT.removeInPage(entity.value)
+  const onDeleteEntity = async () => {
+    ent.base().onDelete(entity.value, _index.value)
   }
 
   const onUpEntity = () => {
@@ -295,10 +298,6 @@
   }
 
   const onNewEntity = async (type: EntityType) => {
-    emitter.emit('entity-not-mutate', entity.value)
-
-    await nextTick
-
     CONTEXT.newInPageByOption({
       entity: entity.value,
       type,
@@ -306,6 +305,11 @@
 
     await nextTick
 
+    emitter.emit('entity-text-focus', {
+      position: 'end',
+      target: _index.value + 1,
+    })
+
     plugin.emit('plugin-entity-create', {
       data: entity.value.raw,
       index: CONTEXT.entities.indexOf(entity.value),
diff --git a/packages/better-write-app/src/components/page/editor/entity/default/options/EditorEntityDefaultOptionsItem.vue b/packages/better-write-app/src/components/page/editor/entity/default/options/EditorEntityDefaultOptionsItem.vue
index b6cba3663..4c883279d 100644
--- a/packages/better-write-app/src/components/page/editor/entity/default/options/EditorEntityDefaultOptionsItem.vue
+++ b/packages/better-write-app/src/components/page/editor/entity/default/options/EditorEntityDefaultOptionsItem.vue
@@ -27,7 +27,6 @@
 
 <script setup lang="ts">
   import { useAbsoluteStore } from '@/store/absolute'
-  import useEmitter from '@/use/emitter'
   import { ref, nextTick } from 'vue'
 
   const props = defineProps({
@@ -46,7 +45,6 @@
   const ABSOLUTE = useAbsoluteStore()
 
   const emit = defineEmits(['action'])
-  const emitter = useEmitter()
   const hover = ref<boolean>(false)
 
   const onAction = async () => {
@@ -54,8 +52,6 @@
 
     emit('action')
 
-    emitter.emit('entity-reset')
-
     await nextTick
 
     onClose()
diff --git a/packages/better-write-app/src/main.ts b/packages/better-write-app/src/main.ts
index a40071674..9f6b2a7ce 100644
--- a/packages/better-write-app/src/main.ts
+++ b/packages/better-write-app/src/main.ts
@@ -9,7 +9,7 @@ import { MotionPlugin as motion } from '@vueuse/motion'
 import tooltip from 'floating-vue'
 import toast, { POSITION } from 'vue-toastification'
 import mitt from 'mitt'
-import { VueEmitter } from 'better-write-types'
+import { Events } from 'better-write-types'
 import { useEnv } from './use/env'
 
 import router from './router'
@@ -29,9 +29,9 @@ const app = createApp(App)
 export const head = createHead()
 export const store = createPinia()
 export const core = createPluginCore()
-export const emitter = mitt()
+export const emitter = mitt<Events>()
 
-app.config.globalProperties.emitter = emitter as VueEmitter
+app.config.globalProperties.emitter = emitter
 
 app.use(router)
 app.use(store as any)
diff --git a/packages/better-write-app/src/store/context.ts b/packages/better-write-app/src/store/context.ts
index 68203cc35..ada306245 100644
--- a/packages/better-write-app/src/store/context.ts
+++ b/packages/better-write-app/src/store/context.ts
@@ -190,7 +190,7 @@ export const useContextStore = defineStore('context', {
       this.entities = useUtils().array().insert(this.entities, index, insert)
     },
     newInPageByOption({ entity, type }: ContextActionNewInPage) {
-      if (!entity || !entity.raw) return
+      if (!entity) return
 
       const index = this.entities.indexOf(entity as Entity)
 
diff --git a/packages/better-write-app/src/use/editor.ts b/packages/better-write-app/src/use/editor.ts
index 66f997cce..66c7ddbde 100644
--- a/packages/better-write-app/src/use/editor.ts
+++ b/packages/better-write-app/src/use/editor.ts
@@ -7,12 +7,13 @@ import { useLocalStorage } from '@/use/storage/local'
 import { useEventListener, useFullscreen } from '@vueuse/core'
 import { useHead } from '@vueuse/head'
 import { usePlugin } from 'better-write-plugin-core'
-import { computed, onMounted, watch } from 'vue'
+import { computed, onBeforeUnmount, onMounted, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { onBeforeRouteLeave, useRouter } from 'vue-router'
 import { useListener } from './listener'
 import { s } from '@/use/storage/supabase'
 import { useAuthStore } from '@/store/auth'
+import { useStorage } from './storage/storage'
 
 export const useEditor = () => {
   const PROJECT = useProjectStore()
@@ -28,6 +29,7 @@ export const useEditor = () => {
   const { t } = useI18n()
   const { toggle } = useFullscreen()
   const router = useRouter()
+  const storage = useStorage()
 
   const init = () => {
     if (!AUTH.account.user) router.push('/')
@@ -36,6 +38,10 @@ export const useEditor = () => {
       project.onLoadProject()
     })
 
+    onBeforeUnmount(async () => {
+      await storage.normalize()
+    })
+
     // tracking all auto-save cases
     watch(
       PROJECT.$state,
diff --git a/packages/better-write-app/src/use/emitter.ts b/packages/better-write-app/src/use/emitter.ts
index 8dbcdaa74..713ae578a 100644
--- a/packages/better-write-app/src/use/emitter.ts
+++ b/packages/better-write-app/src/use/emitter.ts
@@ -1,10 +1,11 @@
+import { Events } from 'better-write-types'
+import { Emitter } from 'mitt'
 import { getCurrentInstance, ComponentInternalInstance } from 'vue'
-import { VueEmitter } from 'better-write-types'
 
 export default function useEmitter() {
   const internalInstance = getCurrentInstance()
   const emitter = (internalInstance as ComponentInternalInstance).appContext
     .config.globalProperties.emitter
 
-  return emitter as VueEmitter
+  return emitter as Emitter<Events>
 }
diff --git a/packages/better-write-app/src/use/entity.ts b/packages/better-write-app/src/use/entity.ts
index aa1ee5420..2f04475b7 100644
--- a/packages/better-write-app/src/use/entity.ts
+++ b/packages/better-write-app/src/use/entity.ts
@@ -1,4 +1,4 @@
-import { Entity, EntityType, Entities } from 'better-write-types'
+import { Entity, EntityType } from 'better-write-types'
 import { nextTick } from 'vue'
 import { useEnv } from './env'
 import { useProjectStore } from '@/store/project'
@@ -133,104 +133,19 @@ export const useEntity = () => {
   }
 
   const base = () => {
-    const onPaste = async (
-      entity: Entity,
-      value: string,
-      event: any,
-      el: HTMLDivElement
-    ) => {
-      event.preventDefault()
-      event.stopPropagation()
-
-      const data = input.pasteText(event)
-      const entities: Entities = []
-      let isFirst = true
-      let isReallyFirst = true
-      let offsetFirst = 0
-      let restStr = ''
-
-      storage.normalize().then(() => {
-        const index = CONTEXT.entities.indexOf(entity)
-
-        data.forEach(async (data: string, index: number, arr: string[]) => {
-          const normalize = data.replace(/\s+/g, ' ').trim()
-
-          if (normalize) {
-            const content = factory.entity().create(entity.type)
-
-            if (isFirst) {
-              content.raw = utils().normalizeEmptyLines(content.raw)
-
-              const offset = raw.v2().caret().index(el)
-
-              const v = raw
-                .v2()
-                .html()
-                .insert(value, offset || PROJECT.offsetLoaded, data)
-
-              content.raw = v
-
-              offsetFirst = offset + data.length
-
-              restStr = v.substring(offsetFirst, v.length)
-
-              if (arr.length > 1) {
-                content.raw = content.raw.substring(0, offsetFirst)
-              }
-
-              isFirst = false
-            } else {
-              content.raw = normalize
-            }
-
-            entities.push(content)
-
-            // create last element with restStr
-            if (index === arr.length - 1 && !isReallyFirst && restStr) {
-              const lastContent = factory.entity().create(entity.type)
-
-              content.raw = restStr
-
-              entities.push(lastContent)
-            }
-
-            isReallyFirst = false
-          }
-        })
-
-        storage.normalize().then(async () => {
-          CONTEXT.newInPaste(entities, entity).then(async () => {
-            const position = index + entities.length - 1
-
-            await nextTick
-
-            raw.v2().caret().set(el, offsetFirst, true)
-
-            emitter.emit('entity-scroll-by-index', position)
-
-            emitter.emit('entity-open-by-index', position)
-
-            plugin.emit('plugin-entity-paste-in-page', {
-              index,
-              quantity: entities.length,
-            })
-          })
-        })
-      })
-    }
-
     const onUp = async (entity: Entity, index: number) => {
-      await nextTick
-
-      emitter.emit('entity-not-mutate', entity)
-
-      await nextTick
-
       CONTEXT.switchInPage({
         entity,
         direction: 'up',
       })
 
+      await nextTick
+
+      emitter.emit('entity-text-focus', {
+        position: 'end',
+        target: index - 1,
+      })
+
       if (index === 0) return
 
       plugin.emit('plugin-entity-swap', {
@@ -240,61 +155,39 @@ export const useEntity = () => {
     }
 
     const onDown = async (entity: Entity, index: number) => {
-      await nextTick
-
-      emitter.emit('entity-not-mutate-down', entity)
-
-      await nextTick
-
       CONTEXT.switchInPage({
         entity,
         direction: 'down',
       })
 
-      if (index === CONTEXT.entities.length - 1) return
-
-      plugin.emit('plugin-entity-swap', {
-        direction: 'down',
-        index,
-      })
-    }
-
-    const onUpCursor = async (entity: Entity) => {
-      emitter.emit('entity-close', { all: true })
-
       await nextTick
 
-      emitter.emit('entity-open', {
-        entity: entity,
-        up: true,
-        selectionInitial: true,
-        keyboard: true,
+      emitter.emit('entity-text-focus', {
+        position: 'end',
+        target: index + 1,
       })
-    }
-
-    const onDownCursor = async (entity: Entity) => {
-      emitter.emit('entity-close', { all: true })
 
-      await nextTick
+      if (index === CONTEXT.entities.length - 1) return
 
-      emitter.emit('entity-open', {
-        entity,
-        up: false,
-        selectionInitial: true,
-        keyboard: true,
+      plugin.emit('plugin-entity-swap', {
+        direction: 'down',
+        index,
       })
     }
 
     const onDelete = async (entity: Entity, index: number) => {
-      emitter.emit('entity-not-mutate', entity)
+      CONTEXT.removeInPage(entity)
 
       await nextTick
 
-      CONTEXT.removeInPage(entity)
+      PROJECT.updateContext(CONTEXT.$state)
 
       await nextTick
 
-      PROJECT.updateContext(CONTEXT.$state)
+      emitter.emit('entity-text-focus', {
+        position: 'end',
+        target: index - 1,
+      })
 
       plugin.emit('plugin-entity-delete', index)
     }
@@ -324,11 +217,8 @@ export const useEntity = () => {
     }
 
     return {
-      onPaste,
       onUp,
       onDown,
-      onUpCursor,
-      onDownCursor,
       onDelete,
       onDeleteRaw,
       onBoldRaw,
diff --git a/packages/better-write-app/src/use/page.ts b/packages/better-write-app/src/use/page.ts
index d66e3e61a..2bdeeaccf 100644
--- a/packages/better-write-app/src/use/page.ts
+++ b/packages/better-write-app/src/use/page.ts
@@ -28,8 +28,6 @@ export const usePage = () => {
     const arr = PROJECT.pages
     const obj = arr[arr.length - 1]
 
-    emitter.emit('entity-not-mutate')
-
     await nextTick
 
     CONTEXT.load(obj)
@@ -54,10 +52,6 @@ export const usePage = () => {
 
     await nextTick
 
-    emitter.emit('entity-not-mutate')
-
-    await nextTick
-
     CONTEXT.load(PROJECT.pages[PROJECT.pages.length - 1])
   }
 
diff --git a/packages/better-write-app/src/use/raw.ts b/packages/better-write-app/src/use/raw.ts
index d2ce31d88..a16751472 100644
--- a/packages/better-write-app/src/use/raw.ts
+++ b/packages/better-write-app/src/use/raw.ts
@@ -525,6 +525,30 @@ export const useRaw = () => {
         if (focus) el.focus()
       }
 
+      const setEnd = (el: HTMLParagraphElement) => {
+        el.focus()
+
+        if (
+          typeof window.getSelection != 'undefined' &&
+          typeof document.createRange != 'undefined'
+        ) {
+          const range = document.createRange()
+          range.selectNodeContents(el)
+          range.collapse(false)
+
+          const sel = window.getSelection()
+          sel?.removeAllRanges()
+          sel?.addRange(range)
+          // @ts-ignore
+        } else if (typeof document.body.createTextRange != 'undefined') {
+          // @ts-ignore
+          const textRange = document.body.createTextRange()
+          textRange.moveToElementText(el)
+          textRange.collapse(false)
+          textRange.select()
+        }
+      }
+
       const end = (el: HTMLDivElement) => {
         return index(el) === el.innerText.length
       }
@@ -550,7 +574,7 @@ export const useRaw = () => {
             set(input as HTMLDivElement, offset as number)
             break
           case 'end':
-            set(input as HTMLDivElement, input?.innerHTML.length as any)
+            setEnd(input as HTMLDivElement)
             break
           case 'auto':
             input?.focus()
@@ -569,7 +593,18 @@ export const useRaw = () => {
         }
       }
 
-      return { set, html, index, end, start, empty, value, object, focus }
+      return {
+        set,
+        setEnd,
+        html,
+        index,
+        end,
+        start,
+        empty,
+        value,
+        object,
+        focus,
+      }
     }
 
     const validate = (arr: Array<string>): Array<V2RawSet> => {
diff --git a/packages/better-write-app/src/use/storage/storage.ts b/packages/better-write-app/src/use/storage/storage.ts
index d342e5615..b6e0b8278 100644
--- a/packages/better-write-app/src/use/storage/storage.ts
+++ b/packages/better-write-app/src/use/storage/storage.ts
@@ -106,8 +106,6 @@ export const useStorage = () => {
   }
 
   const normalize = async () => {
-    // close open entities contents
-    emitter.emit('entity-edit-save')
     // text block saver
     emitter.emit('entity-text-force-save')
     // force entity paragraph comment a save / close comment modal
diff --git a/packages/better-write-types/src/types/emitter.ts b/packages/better-write-types/src/types/emitter.ts
index c9b116116..9e627f8bd 100644
--- a/packages/better-write-types/src/types/emitter.ts
+++ b/packages/better-write-types/src/types/emitter.ts
@@ -1,4 +1,6 @@
 import { Entity } from './context'
+import { ID } from './utils'
+
 export interface VueEmitterEntityClose {
   all?: boolean
 }
@@ -12,32 +14,18 @@ export interface VueEmitterEntityOpen {
   keyboard?: boolean
 }
 
-export type VueEmitterName =
-  | 'entity-reset'
-  | 'entity-input-focus'
-  | 'entity-open'
-  | 'entity-open-by-index'
-  | 'entity-scroll-by-index'
-  | 'entity-close'
-  | 'entity-focus'
-  | 'entity-input-raw'
-  | 'entity-open-last'
-  | 'entity-not-mutate'
-  | 'entity-force-close'
-  | 'entity-not-mutate-down'
-  | 'entity-edit-save'
-  | 'entity-hover'
-  | 'entity-external-comment-save'
-  | 'entity-speech-recognition'
-  | 'entity-text-focus'
-  | 'entity-text-force-save'
-  | 'controller-entity-next'
-  | 'controller-entity-back'
-  | 'project-creative-drafts-set-info'
-  | 'project-save'
-  | 'pdf-preview-exists'
+export type EventsEntityTextFocus = {
+  position: 'start' | 'offset' | 'end' | 'auto'
+  positionOffset?: number
+  target: ID<number>
+}
 
-export interface VueEmitter {
-  on: (name: VueEmitterName, callback: (...c: any) => any) => void
-  emit: (name: VueEmitterName, ...c: any) => void
+export type Events = {
+  'entity-external-comment-save': any
+  'entity-speech-recognition': any
+  'entity-text-focus': EventsEntityTextFocus
+  'entity-text-force-save': void
+  'project-creative-drafts-set-info': any
+  'project-save': any
+  'pdf-preview-exists': any
 }