Browse Source

fix: page rename e2e

Peng Xiao 3 years ago
parent
commit
694e626b5d
2 changed files with 18 additions and 19 deletions
  1. 3 3
      e2e-tests/page-rename.spec.ts
  2. 15 16
      src/main/frontend/components/page.cljs

+ 3 - 3
e2e-tests/page-rename.spec.ts

@@ -1,4 +1,4 @@
-import { expect } from '@playwright/test'
+import { expect, Page } from '@playwright/test'
 import { test } from './fixtures'
 import { IsMac, createPage, randomLowerString, newBlock, newInnerBlock, randomString, lastBlock } from './utils'
 
@@ -6,7 +6,7 @@ import { IsMac, createPage, randomLowerString, newBlock, newInnerBlock, randomSt
  * Test rename feature
  ***/
 
-async function page_rename_test(page, original_page_name: string, new_page_name: string) {
+async function page_rename_test(page: Page, original_page_name: string, new_page_name: string) {
   let selectAll = 'Control+a'
   if (IsMac) {
     selectAll = 'Meta+a'
@@ -17,7 +17,7 @@ async function page_rename_test(page, original_page_name: string, new_page_name:
   let new_name = new_page_name + rand
 
   await createPage(page, original_name)
-  await page.click('.page-title .title')
+  await page.click('.ls-page-title .page-title')
   await page.waitForSelector('input[type="text"]')
   await page.keyboard.press(selectAll)
   await page.keyboard.press('Backspace')

+ 15 - 16
src/main/frontend/components/page.cljs

@@ -263,8 +263,7 @@
                           (reset! *title-value old-name)
                           (reset! *edit? false)))
        :on-focus (fn []
-                   (when untitled? (reset! *title-value ""))
-                   (js/setTimeout #(when-let [input (rum/deref input-ref)] (.select input))))}]]))
+                   (when untitled? (reset! *title-value "")))}]]))
 
 (rum/defcs page-title < rum/reactive
   (rum/local false ::edit?)
@@ -284,21 +283,21 @@
                   (pdf-assets/human-hls-filename-display title)
                   (if fmt-journal? (date/journal-title->custom-format title) title))
           old-name (or title page-name)]
-      [:h1.page-title.flex.gap-1
+      [:h1.page-title.flex.cursor-pointer.gap-1
        {:on-mouse-down (fn [e]
-                         (when (util/right-click? e)
-                           (state/set-state! :page-title/context {:page page-name})))
-        :on-click (fn [e]
-                    (.preventDefault e)
-                    (if (gobj/get e "shiftKey")
-                      (when-let [page (db/pull repo '[*] [:block/name page-name])]
-                        (state/sidebar-add-block!
-                         repo
-                         (:db/id page)
-                         :page))
-                      (when (and (not hls-file?) (not fmt-journal?))
-                        (reset! *input-value (if untitled? "" old-name))
-                        (reset! *edit? true))))}
+                           (when (util/right-click? e)
+                             (state/set-state! :page-title/context {:page page-name})))
+          :on-click (fn [e]
+                      (.preventDefault e)
+                      (if (gobj/get e "shiftKey")
+                        (when-let [page (db/pull repo '[*] [:block/name page-name])]
+                          (state/sidebar-add-block!
+                           repo
+                           (:db/id page)
+                           :page))
+                        (when (and (not hls-file?) (not fmt-journal?))
+                          (reset! *input-value (if untitled? "" old-name))
+                          (reset! *edit? true))))}
        (when (not= icon "") [:span.page-icon icon])
        [:div.page-title-sizer-wrapper.relative
         (when (rum/react *edit?)