Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
400a827e3f | ||
|
|
699165469d | ||
|
|
3a6445ca4e | ||
|
|
033490c464 | ||
|
|
f132885b08 | ||
|
|
a79bdc1641 |
+254
@@ -1,5 +1,259 @@
|
||||
# Changelog - FlowDeck
|
||||
|
||||
## v7.64.0 (2026-10-08) — Commentaires façon Notion : ancres jaunes, tiroir refondu, réactions sur texte
|
||||
|
||||
### Added
|
||||
|
||||
- **Réactions emoji sur un texte sélectionné** :
|
||||
- bouton **🙂+** dans la 3ᵉ ligne de la toolbar de sélection, infobulle
|
||||
« React to selected text » → ouvre le **sélecteur d'émoji existant** en mode
|
||||
réaction : en-tête = texte sélectionné (+ ✋), onglets masqués (emoji only),
|
||||
ligne **Recent** au-dessus de la grille **People**, Filter… et barre de
|
||||
catégories inchangées (dont `+` émoji custom).
|
||||
- **stockage** : migration 37 (`text_reactions`, une ligne par plage × émoji ×
|
||||
utilisateur, `UNIQUE` qui rend le POST idempotent) + endpoints
|
||||
`GET/POST /api/pages/{id}/reactions` (GET groupé par plage : `emoji/count/mine`,
|
||||
POST = toggle avec validation de plage non vide).
|
||||
- **affichage** : la plage est peinte en jaune (`.fd-anchor-react`) avec une
|
||||
**pastille** juste après (`😀` + compte si >1) ; clic sur la pastille →
|
||||
réouvre le sélecteur pour cette plage (ajout/suppression).
|
||||
- les pastilles ne sont **pas** du contenu : `gtTok`/`gtMd` les ignorent et les
|
||||
offsets `_srcOffset/_srcNodeLen` les excluent → `sync()` conserve le texte
|
||||
d'origine (vérifié dans le e2e) et les ancres ne décalent jamais.
|
||||
- **Ancres de commentaires visibles** — `_paintAnchors()` (appelé après chaque
|
||||
`render()`, après `loadComments` et `loadReactions`) entoure la plage commentée
|
||||
d'un **jaune** (`.fd-anchor`, gris si résolu) ; **clic sur l'ancre → le tiroir
|
||||
s'ouvre et centre le fil** (flash de surlignage).
|
||||
- **Tiroir de commentaires refondu** (image 1) : fil en carte arrondie avec
|
||||
**avatar coloré + nom + horodatage + ✓ (resolve/reopen) + ⋯** (menu Copy link /
|
||||
Delete), étiquette « 💬 on selected text », et champ de saisie **« Add a
|
||||
comment... »** avec **@** (insère la mention) et **bouton circulaire ↑** (envoi,
|
||||
`Entrée` aussi) — remplace le bouton « Comment ».
|
||||
- **Liens de commentaire** : `Copy link` copie `…#cmt-<id>` ; au chargement d'une
|
||||
page avec ce hash, le fil correspondant s'ouvre et se centre.
|
||||
- **Chargement initial** : `loadComments()` + `loadReactions()` à l'ouverture de la
|
||||
page → les ancres/pastilles sont peintes dès le premier rendu (et `commentCount`
|
||||
du tiroir est enfin renseigné).
|
||||
|
||||
### Fixed
|
||||
|
||||
- **`resolveComment` ne pouvait pas rouvrir** : il envoyait toujours
|
||||
`resolved:true` → accepte désormais l'objet du fil et bascule
|
||||
(`resolveComment(c)`), le bouton ✓ du fil est donc réellement un toggle.
|
||||
- **`showCommentBtn` ignorait les sélections à ancre « élément »** (double-clic,
|
||||
sélection programmatique) → `closest('[data-bid]')` partait du wrapper et le
|
||||
bouton 💬 n'apparaissait pas → gère les 2 types de nœud (même fix que `showFmt`
|
||||
en v7.62).
|
||||
- **`gtTok` chemin rapide (`innerText`) incluait les pastilles de réaction** →
|
||||
sélecteur enrichi (`.fd-react-chip`) pour basculer sur le marcheur qui les
|
||||
exclut : le texte sauvé reste identique.
|
||||
|
||||
### Tests
|
||||
|
||||
- `tests/test_v764_comments_reactions.py` (8 tests) : table + migration 37,
|
||||
endpoints enregistrés, **toggle API réel** (added → removed → added, grouping,
|
||||
400 sur plage vide), markup toolbar/tiroir, peinture des ancres, mode réaction
|
||||
du sélecteur.
|
||||
- **e2e Playwright** `e2e/v764_comments_reactions.spec.js` : bouton 🙂+ avec la
|
||||
bonne infobulle → sélecteur (en-tête = texte, Filter…, onglets masqués) →
|
||||
pastille + plage jaune **avec contenu inchangé après `sync()`** → 💬 → tiroir
|
||||
(avatar, nom, ✓, ⋯, Copy link) → ancre jaune cliquable → ✓ résout → reload :
|
||||
ancres et pastilles rechargées depuis la base ; **3/3 specs e2e verts**
|
||||
(`--workers=1`).
|
||||
- **Suite complète** : `pytest tests/ -q -n auto` → **1383 passed / 0 failed**,
|
||||
`ruff check app tests` → All checks passed.
|
||||
|
||||
## v7.63.0 (2026-10-08) — Menus mobiles façon Notion (barre au « / » + Insert block plein écran)
|
||||
|
||||
### Added
|
||||
|
||||
- **Barre horizontale mobile** — sur un viewport ≤ 768 px, taper `/` sur une ligne
|
||||
vide affiche une **barre flottante défilante sous le curseur** (au lieu de la popup
|
||||
desktop), 15 boutons dans l'ordre Notion : `+▾`, `Turn into▾`, `@`, 💬, 🖼, 🗑,
|
||||
`←`, `→`, `↑`, `↓`, `↩`, `↪`, `Color▾`, `More▾`, `⌨` :
|
||||
- `+▾` → **feuille plein écran « Insert block »** : titre centré, bouton bleu
|
||||
« Cancel », liste verticale par groupes (Basic blocks / AI writing / Media /
|
||||
Data / Synced / Actions) avec icône, nom et **raccourci markdown** à droite
|
||||
(`#`, `##`, `-`, `1.`, `[]`, `>`, `"`, `---`…) — items partagés avec la popup
|
||||
desktop (`SM._slashItemHtml`), choix → `applySlash` → tout se referme.
|
||||
- `Turn into▾` / `Color▾` → feuilles réutilisant **les mêmes générateurs d'items**
|
||||
que les sous-menus du menu de bloc (`_blockTurnItems` / `_blockColorItems`
|
||||
extraits de `_blockTurnMenuOpen` / `_blockColorMenuOpen`).
|
||||
- `More▾` → menu contextuel de bloc existant (recherche + 10 actions + pied).
|
||||
- `@` insère `@` et ouvre le sélecteur de mention ; 💬 commentaire ; 🖼 insère un
|
||||
bloc image ; 🗑 supprime ; `⌨` masque le clavier ; `↩ ↪` annuler/rétablir.
|
||||
- **Déplacement de bloc `moveBlock(bid, dir)`** — `↑↓` réordonne (y compris dans un
|
||||
parent toggle/columns), `→` indente dans le frère précédent (toggle/columns),
|
||||
`←` ressort à la racine ; garde-fous avec toast (déjà en haut/bas, déjà à la
|
||||
racine, pas de cible).
|
||||
- **Fermeture automatique** de la barre quand le `/` n'est plus au début du bloc ;
|
||||
taps dans la barre/la feuille n'essaient plus de fermer le menu (exclusion
|
||||
`MTB.contains` sur le handler mousedown hors-zone).
|
||||
- **Raccourcis slash alignés sur les préfixes markdown** (description Notion) :
|
||||
`-` (puces), `[]` (à faire), `>` (toggle), `---` (séparateur) — partagés avec la
|
||||
popup desktop ; groupe `SYNCED` libellé « Synced ».
|
||||
|
||||
### Tests
|
||||
|
||||
- `tests/test_v763_mobile_menus.py` : ordre des 15 boutons, câblage de chaque
|
||||
action, structure de la feuille (titre/Cancel/groupes), branchement mobile,
|
||||
styles — et **`moveBlock` exécuté pour de vrai sous node** (ordre, indent,
|
||||
outdent, garde-fous).
|
||||
- **e2e Playwright mobile** `e2e/v763_mobile_menus.spec.js` (viewport 390×844,
|
||||
`hasTouch`) : barre visible au `/` avec les 15 boutons dans l'ordre + `overflow-x:auto`
|
||||
et popup desktop masquée, « Insert block » (groupes, raccourci `#` de Heading 1)
|
||||
→ le bloc devient `heading_1`, « Turn into » (coche du type courant), « Color »
|
||||
(3 groupes), « More » (menu de bloc + pied), `↑` qui réordonne réellement les blocs.
|
||||
- `tests/test_v761_block_menu.py` adapté aux extractions `_blockTurnItems` /
|
||||
`_blockColorItems`.
|
||||
|
||||
## v7.62.0 (2026-10-08) — Menu contextuel au highlight de texte (toolbar façon Notion)
|
||||
|
||||
### Added
|
||||
|
||||
- **Toolbar de sélection** — dès qu'un texte est surligné dans l'éditeur, un menu
|
||||
flottant apparaît **sous la sélection** (au-dessus si manque de place), centré et
|
||||
clampé au viewport, en 4 lignes comme dans Notion :
|
||||
1. **Style de texte** — `T` + libellé **dynamique** du type de bloc (Normal Text,
|
||||
Heading 1… ; le type courant) + `›` → ouvre le sous-menu **Turn into** existant
|
||||
(coche sur le type actuel, fermeture au survol sortant).
|
||||
2. **A** (sous-menu Color : texte/fond + dernière couleur), **B** gras, *I* italique,
|
||||
**U** souligné, **T** barré, **Tx** code inline.
|
||||
3. 🔗 lien, **S** surlignage (`<mark>`), `</>` bloc code, **√x** équation inline
|
||||
(prompt LaTeX → KaTeX), **…** → menu contextuel de bloc (recherche + 10 actions +
|
||||
pied « Last edited by … / N words, M characters »).
|
||||
4. 💬 Comment (`Ctrl+⇧+M`), ✨ Ask AI (`Ctrl+J`).
|
||||
puis la section grise **Skills** (Improve writing, Proofread, Explain, Reformat →
|
||||
`runSkill` sur le bloc) et le pied **Edit with AI** `Alt+⇧+E`.
|
||||
- **Info-bulle claire à droite** des éléments du menu — extension du système de
|
||||
tooltip existant (`app.js`) : `data-tooltip-html` (ex. en italique + description
|
||||
pour la ligne 1) + classe `.tooltip-light`, position à droite de l'élément (débord
|
||||
→ à gauche), sous l'élément hors toolbar.
|
||||
- **Persistance du formatage inline** : nouveau sérialiseur **`gtMd()`** (DOM formaté
|
||||
→ source markdown) appelé par `sync()` (blocs + enfants toggle/columns) — le
|
||||
formatage posé ressort en `**gras**`, `*ital*`, `__souligné__`, `~~barré~~`,
|
||||
`` `code` ``, `==surlignage==`, `[texte](url)` ; les chips wiki gardent leur token.
|
||||
`mdEsc()` rend en plus `__…__` (`<u>`), `==…==` (`<mark>`) et `$$…$$`
|
||||
(équation inline KaTeX, `data-tex` conservé pour l'aller-retour).
|
||||
- **Fermeture propre** : clic hors sélection → le menu se referme ; clic **dans** la
|
||||
toolbar → sélection et menu intacts (`@mousedown.prevent` + garde `mouseup`).
|
||||
|
||||
### Fixed
|
||||
|
||||
- **`askAI(idx)` était écrasé par `askAI()`** (même clé dans l'objet éditeur, définie
|
||||
plus bas) : « Ask AI » du menu de bloc et `Ctrl+J` ouvraient l'IA de **page** au
|
||||
lieu du composeur du bloc → renommé **`askAIBlock(idx)`** (appels : menu de bloc,
|
||||
`Ctrl+J`, `Alt+⇧+E`).
|
||||
- **`ed.__x` introuvable sous Alpine v3** — le data de `.page-editor-wrapper` était
|
||||
lu via `ed.__x` (API Alpine v2, plus exposée depuis le bundle CSP) : `showFmt`,
|
||||
`hideCommentBtn` et les handlers de mentions ne s'exécutaient **jamais** → la
|
||||
toolbar de sélection n'apparaissait pas. Accès unifié via `_xed()`
|
||||
(`_x_dataStack[0]`, repli `__x`), 4 sites éditeur.
|
||||
- **Ancre de sélection** — `closest('[data-bid]')` partait du parent de l'ancre :
|
||||
quand l'ancre est un nœud **élément** (sélection programmée, double-clic), le bloc
|
||||
n'était jamais trouvé → `showFmt` pas appelé. Gestion des 2 types de nœud.
|
||||
- **Barre d'espace = exception** — `checkMd()` recevait l'**id** du bloc au lieu de
|
||||
l'index : chaque espace levait `Cannot read properties of undefined (reading 'id')`
|
||||
et les raccourcis markdown (`# `, `- `) ne se déclenchaient jamais.
|
||||
|
||||
### Tests
|
||||
|
||||
- `tests/test_v762_selection_toolbar.py` : ordre des 4 lignes + Skills + pied,
|
||||
câblage réel des actions, persistance `gtMd`/`mdEsc` (**roundtrip réel sous node**),
|
||||
placement/fermeture, styles ; `tests/test_v761_block_menu.py` adapté
|
||||
(`askAIBlock`).
|
||||
- **e2e Playwright** `e2e/v762_selection_toolbar.spec.js` (instance 8081) : structure
|
||||
des 4 lignes, sous-menu Turn into (coche du type courant), menu « … » (recherche +
|
||||
pied), géométrie (sous la sélection, dans le viewport), **persistance du gras et du
|
||||
surlignage après reload**, fermeture hors sélection → 1 passed (captures dans
|
||||
`e2e/shots/` — répertoire gitignoré).
|
||||
- **Suite complète** : `pytest tests/ -q -n auto` → **1368 passed / 0 failed**,
|
||||
`ruff check app tests` → All checks passed.
|
||||
|
||||
## v7.61.0 (2026-10-08) — Menu contextuel de bloc refondu façon Notion
|
||||
|
||||
### Added
|
||||
|
||||
- **Panneau de gauche** : barre de recherche « Search actions... » (filtre en
|
||||
direct), titre de section « Text », puis les 10 actions dans l'ordre Notion :
|
||||
Turn into ›, Color ›, Copy link to block (`Alt+⇧+L`), Duplicate (`Ctrl+D`),
|
||||
Move to (`Ctrl+⇧+P`), Delete (`Del`), Comment (`Ctrl+⇧+M`), Suggest edits
|
||||
(`Ctrl+⇧+Alt+X`), Ask AI (`Ctrl+J`), Skills › — avec les raccourcis
|
||||
affichés, et le pied de page « Last edited by … / Today at H:MM / N words,
|
||||
M characters » (auteur lu dans le compte, heure = `updatedAt` du bloc page,
|
||||
taille calculée sur le contenu du bloc).
|
||||
- **Sous-menu « Turn into »** (survol du panneau de gauche → panneau de
|
||||
droite, fermeture différée) : Text ✓ (type actuel coché), Heading 1-4,
|
||||
Bulleted list, Numbered list, To-do list, Toggle list, Code, Quote,
|
||||
Callout, Block equation, Synced block, et **2/3/4/5 columns** avec
|
||||
info-bulle « Create N columns of blocks » ; `turnInto(idx, type, cols)`
|
||||
crée désormais N colonnes et ouvre le sélecteur de source pour les blocs
|
||||
synchronisés.
|
||||
- **Sous-menu « Color »** : sections **Last used** (raccourci `Ctrl+⇧+H`),
|
||||
**Text color** (Default, Gray, Brown, Orange, Yellow ✓, Green, Blue,
|
||||
Purple, Pink, Red — glyphe « A » à la couleur) et **Background color**
|
||||
(même palette avec carré de couleur) ; la couleur utilisée est cochée, la
|
||||
dernière est mémorisée (`localStorage fdLastBlockColor`).
|
||||
- **Sous-menu « Skills »** : liste réelle des compétences de l'espace
|
||||
(`GET /api/agent/skills`) → applique le `prompt_template` au contenu du
|
||||
bloc via l'IA et insère le résultat dessous.
|
||||
- **Raccourcis** — handler clavier dédié : `Ctrl+J` (Ask AI), `Ctrl+⇧+H`
|
||||
(dernière couleur), `Ctrl+⇧+M` (commenter le bloc : sélection du contenu +
|
||||
tiroir de commentaires), `Ctrl+⇧+Alt+X` (suggérer une édition → résultat
|
||||
inséré dessous), `Alt+⇧+L` (copier le lien), `Ctrl+⇧+P` (déplacer vers…),
|
||||
`Ctrl+D` (dupliquer — déjà géré par la saisie, pas de double), `Del`
|
||||
(**seulement avec le menu ouvert**, jamais pendant la saisie), `Échap`
|
||||
(fermer).
|
||||
- **Actions Suggest edits / Ask AI / Comment / Skills** réelles côté éditeur
|
||||
(`suggestEdit`, `askAI`, `commentBlock`, `runSkill`) — Ask AI ouvre le
|
||||
composeur inline sans effacer le contenu du bloc.
|
||||
- **Styles** : `.bm-group`, `.bm-foot`, `.bm-check`, `.bm-current`,
|
||||
`.bm-dot`, sous-menu `60vh` défilable, recherche focalisée à l'ouverture.
|
||||
- **Tests** — `tests/test_v761_block_menu.py` : **9 tests** (structure et
|
||||
ordre du panneau, dispatch des 10 actions, 3 sous-menus, survol/fermeture,
|
||||
les 9 raccourcis, comportement node : `turnInto(…, 'columns', 3)` → 3
|
||||
colonnes, styles) + `test_v7593` adapté à la nouvelle signature.
|
||||
|
||||
### Removed
|
||||
|
||||
- Entrées **Copy / Cut / Paste blocks** du menu (absentes de la spécification
|
||||
Notion) — les raccourcis `Ctrl+C/X/V` sur blocs sélectionnés sont conservés.
|
||||
- Pastilles de couleurs inline : remplacées par le sous-menu Color nommé
|
||||
(palette portée à 10 couleurs alignées Notion : +Brown, Pink réel).
|
||||
|
||||
## v7.60.0 (2026-10-07) — Éditeur : bouton + à gauche du handle de bloc
|
||||
|
||||
### Added
|
||||
|
||||
- **Bouton `+` à gauche du handle** (les 6 points qui ouvrent le menu ⋮⋮ /
|
||||
servent au drag) : clique → **nouveau bloc inséré sous le bloc courant**,
|
||||
via le mécanisme déjà en place (`E.addAfter(idx)` → `addAt(idx+1)`).
|
||||
- Positionné dans la gouttière (`left:-64px`, gouttière `.blocks-container`
|
||||
de 64px, `-56px` quand elle passe à 32px), apparaît au survol/focus du bloc
|
||||
comme le handle, masqué avec lui sur écran étroit (≤768px et le second
|
||||
breakpoint — aucun débordement horizontal ajouté au conteneur.
|
||||
- `aria-label` + `title` « Add block below » (accessibilité).
|
||||
- **Tests** — `tests/test_v760_block_insert_btn.py` : **2 tests** (ordre
|
||||
dans le wrapper, câblage `E.addAfter`, positions/masquages CSS).
|
||||
|
||||
## v7.59.3 (2026-10-07) — Correction : « Turn into » du menu contextuel
|
||||
|
||||
### Fixed
|
||||
|
||||
- **« Turn into… » ne faisait rien** — la garde validait le type avec
|
||||
`_BLOCK_TURN_TYPES.indexOf(type)` alors que ce tableau contient des **objets**
|
||||
`{id, name}` : `indexOf` d'une chaîne renvoyait toujours `-1` → `turnInto()`
|
||||
retournait immédiatement après l'ouverture du sous-menu. Correction :
|
||||
`_BLOCK_TURN_TYPES.some(t=>t.id===type)`.
|
||||
- **Texte conservé** — convertir un bloc en **To-do** ou **Toggle** vidait le
|
||||
contenu (ces deux types étaient exclus de la conservation par erreur) ; seul
|
||||
un type sans champ texte (`image`, `embed`, `divider`, `button`, `columns`,
|
||||
…) le vide désormais, comme dans `Notion`.
|
||||
- **Tests** — `tests/test_v7593_turn_into.py` : **4 tests**, dont 1
|
||||
comportemental **node** qui exécute la vraie `turnInto()` extraite de la
|
||||
source : conversion effective du type, texte conservé (To-do = étiquette +
|
||||
case décochée), contenu vidé pour un type sans champ texte.
|
||||
|
||||
## v7.59.2 (2026-10-07) — Corrections : aide, « Insert below », listes numérotées
|
||||
|
||||
### Fixed
|
||||
|
||||
+52
@@ -1408,6 +1408,58 @@ Détails livrés :
|
||||
- [x] **Tests follow-ups** — `tests/test_v73_wiki_polish.py` (58 → **72 tests**) : sidebar cross-workspace, page teamspace (owner 200 / outsider 404 API), auto-follow comment, notif throttlée, unfurl gitea/github + endpoint, KPI + dashboards multi-DB
|
||||
- [x] **Suite complète** — `python -m pytest -n auto` → **1016 passed** (était 981 passed / 21 failed en SSO)
|
||||
|
||||
### v7.62.0 — Menu contextuel au highlight de texte ✅ (2026-10-08)
|
||||
> **Objectif** : menu façon Notion (mode sombre) au surlignage de texte dans l'éditeur. **COMPLETED**.
|
||||
|
||||
- [x] **Toolbar de sélection 4 lignes** — `T` + type de bloc dynamique + `›` (sous-menu Turn into existant) / `A` `B` `I` `U` `T` barré `Tx` / 🔗 `S` `</>` `√x` `…` / 💬 `✨`, section grise **Skills** (Improve writing, Proofread, Explain, Reformat → `runSkill`) et pied **Edit with AI** `Alt+⇧+E` — affichée **sous** la sélection (au-dessus si pas de place), clampée au viewport, fermeture au clic hors sélection
|
||||
- [x] **`…` → menu contextuel de bloc** déjà existant (recherche « Search actions… », groupe Text, 10 actions + raccourcis, pied métadonnées auteur/heure/taille) — pas de doublon de menu
|
||||
- [x] **Persistance du formatage inline** — sérialiseur `gtMd()` (DOM → source markdown) branché sur `sync()` ; `mdEsc()` rend `__…__`, `==…==`, `$$…$$` (KaTeX inline) — avant, `sync()` relisait du texte brut et perdait tout le formatage au prochain rendu
|
||||
- [x] **Info-bulle claire à droite** — `data-tooltip-html` + `.tooltip-light` dans le tooltip global (`app.js`)
|
||||
- [x] **Fix `askAI(idx)` écrasé par `askAI()`** — « Ask AI » / `Ctrl+J` ouvraient l'IA de page → `askAIBlock(idx)`
|
||||
- [x] **Fix « toolbar muette sous Alpine v3 »** — `ed.__x` (API v2) n'existe plus : `showFmt`/`hideCommentBtn`/mentions ne s'exécutaient jamais → accès via `_xed()` (`_x_dataStack[0]`) ; ancre de sélection élément gérée ; `checkMd()` recevait un id au lieu d'un index (exception à chaque espace)
|
||||
- [x] **Tests** — `tests/test_v762_selection_toolbar.py` (roundtrip `gtMd`/`mdEsc` réel sous node) + **e2e Playwright** `e2e/v762_selection_toolbar.spec.js` (structure, sous-menus, géométrie, persistance bold/highlight après reload) ; `VERSION` + `app/main.py` = 7.62.0
|
||||
|
||||
### v7.63.0 — Menus mobiles façon Notion ✅ (2026-10-08)
|
||||
> **Objectif** : parité des menus mobiles (Android sombre) — barre contextuelle au
|
||||
> « / » + menu « Insert block » plein écran. **COMPLETED**.
|
||||
|
||||
- [x] **Barre horizontale défilante** sous le curseur (mobile ≤ 768 px) — 15 boutons
|
||||
dans l'ordre Notion : `+▾`, `Turn into▾`, `@`, 💬, 🖼, 🗑, `←→↑↓`, `↩↪`, `Color▾`,
|
||||
`More▾`, `⌨` ; `overflow-x:auto`, fermeture auto quand le `/` disparaît, taps
|
||||
exclus du handler « clic hors-zone »
|
||||
- [x] **Feuille plein écran « Insert block »** (`+`) — titre centré + « Cancel » bleu,
|
||||
groupes CMDS avec raccourcis markdown (items partagés avec la popup desktop) ;
|
||||
`Turn into` / `Color` réutilisent les générateurs extraits (`_blockTurnItems`,
|
||||
`_blockColorItems`) ; `More` ouvre le menu de bloc existant
|
||||
- [x] **`moveBlock(bid, dir)`** — ↑↓ ordre (racine + enfants toggle/columns),
|
||||
→ indent dans le frère précédent, ← outdent, garde-fous toast
|
||||
- [x] **Raccourcis slash** alignés sur les préfixes markdown (`-`, `[]`, `>`, `---`)
|
||||
- [x] **Tests** — `tests/test_v763_mobile_menus.py` (+ `moveBlock` exécuté sous node),
|
||||
e2e mobile `e2e/v763_mobile_menus.spec.js` (390×844) ; `VERSION` + `app/main.py`
|
||||
= 7.63.0
|
||||
|
||||
### v7.64.0 — Commentaires & réactions façon Notion ✅ (2026-10-08)
|
||||
> **Objectif** : affichage/prise de commentaire identique à Notion + réaction emoji
|
||||
> sur le texte sélectionné. **COMPLETED**.
|
||||
|
||||
- [x] **Réaction sur texte** — bouton 🙂+ (« React to selected text ») dans la
|
||||
toolbar de sélection → sélecteur d'émoji **existant** en mode réaction (en-tête =
|
||||
texte sélectionné + ✋, onglets masqués, Recent au-dessus de People, Filter…,
|
||||
catégories + `+` custom) ; plage jaune + pastille (emoji + compte), clic pastille
|
||||
= rouvrir le sélecteur pour la plage
|
||||
- [x] **Backend** — migration 37 `text_reactions` (UNIQUE plage × emoji × user) +
|
||||
`GET/POST /api/pages/{id}/reactions` (GET groupé, POST toggle) ; `gtTok`/`gtMd`
|
||||
ignorent les pastilles et `_srcOffset` exclut les annotations des offsets → le
|
||||
texte sauvé est identique
|
||||
- [x] **Ancres jaunes** — `_paintAnchors()` après chaque `render()`/chargement ;
|
||||
clic sur l'ancre → tiroir ouvert + fil centré (flash) ; résolu = gris
|
||||
- [x] **Tiroir refondu** — carte de fil (avatar, nom, horodatage, ✓ toggle
|
||||
resolve/reopen, ⋯ → Copy link `#cmt-<id>` / Delete), saisie « Add a comment... »
|
||||
avec `@` et envoi `↑`/Entrée ; `resolveComment(c)` corrige l'impossibilité de
|
||||
rouvrir
|
||||
- [x] **Tests** — `tests/test_v764_comments_reactions.py` (8, dont toggle API réel),
|
||||
e2e `e2e/v764_comments_reactions.spec.js` ; `VERSION` + `app/main.py` = 7.64.0
|
||||
|
||||
---
|
||||
|
||||
## ✅ Fonctionnalités livrées hors roadmap (bonus détectés dans le code)
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
# WORKLOAD — FlowDeck Notion Clone
|
||||
|
||||
> **Début**: 2026-07-08 | **Version**: v7.50.2 (peek de Library nu — iframe pleine, comme local-workspace) | **Statut**: EN COURS 🔄
|
||||
> **Début**: 2026-07-08 | **Version**: v7.64.0 (commentaires façon Notion : ancres jaunes, tiroir refondu, réactions emoji sur texte) | **Statut**: EN COURS 🔄
|
||||
> **Cible**: parité Notion + intégration forge · **Follow-ups v7.3 livrés**: sidebar teamspaces, notif `page.updated`, charts `number` + dashboards multi-DB, unfurl forge, UI Settings → Audit — voir `ROADMAP.md § v7.3.0`
|
||||
|
||||
## Avancement Global
|
||||
|
||||
+1
-1
@@ -186,7 +186,7 @@ async def lifespan(_app: FastAPI):
|
||||
|
||||
app = FastAPI(
|
||||
title="FlowDeck",
|
||||
version="7.59.2",
|
||||
version="7.64.0",
|
||||
docs_url="/docs",
|
||||
redoc_url="/redoc",
|
||||
lifespan=lifespan,
|
||||
|
||||
@@ -1680,6 +1680,32 @@ def _migration_agent_memory(conn: sqlite3.Connection) -> None:
|
||||
)
|
||||
|
||||
|
||||
@register(37, "v7.64.0: réactions emoji sur un texte sélectionné")
|
||||
def _migration_text_reactions(conn: sqlite3.Connection) -> None:
|
||||
"""Réactions emoji ancrées sur une plage de texte (façon Notion) : miroir des
|
||||
ancres de commentaires (block_id + offsets dans le texte rendu). Une ligne par
|
||||
(plage, emoji, utilisateur) → le POST agit comme un toggle et le GET regroupe
|
||||
par plage pour afficher la pastille d'émojis."""
|
||||
conn.execute(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS text_reactions (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
page_id INTEGER NOT NULL REFERENCES pages(id) ON DELETE CASCADE,
|
||||
block_id TEXT NOT NULL,
|
||||
anchor_start INTEGER NOT NULL,
|
||||
anchor_end INTEGER NOT NULL,
|
||||
emoji TEXT NOT NULL,
|
||||
user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
|
||||
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
|
||||
UNIQUE(page_id, block_id, anchor_start, anchor_end, emoji, user_id)
|
||||
)
|
||||
"""
|
||||
)
|
||||
conn.execute(
|
||||
"CREATE INDEX IF NOT EXISTS idx_text_reactions_page ON text_reactions(page_id)"
|
||||
)
|
||||
|
||||
|
||||
@register(36, "v7.59.1: mistral — modèles par défaut hors plan basique")
|
||||
def _migration_mistral_default_model(conn: sqlite3.Connection) -> None:
|
||||
"""mistral-large-latest / pixtral-large-latest renvoient 403
|
||||
|
||||
@@ -206,3 +206,67 @@ def delete_comment(request: Request, comment_id: int):
|
||||
conn.execute("DELETE FROM comments WHERE id=? OR parent_id=?", (comment_id, comment_id))
|
||||
conn.commit()
|
||||
return {"id": comment_id, "status": "deleted"}
|
||||
|
||||
|
||||
# ── v7.64.0 : réactions emoji sur un texte sélectionné ──────────────────────
|
||||
|
||||
@router.get("/pages/{page_id}/reactions")
|
||||
def list_reactions(request: Request, page_id: int):
|
||||
"""Réactions regroupées par plage de texte : {block_id, start, end, emoji, count, mine}."""
|
||||
user = _current_user(request)
|
||||
with get_conn() as conn:
|
||||
if not conn.execute("SELECT id FROM pages WHERE id=?", (page_id,)).fetchone():
|
||||
raise HTTPException(404, "Page not found")
|
||||
rows = conn.execute(
|
||||
"""SELECT block_id, anchor_start, anchor_end, emoji,
|
||||
COUNT(*) AS count,
|
||||
MAX(CASE WHEN user_id=? THEN 1 ELSE 0 END) AS mine
|
||||
FROM text_reactions
|
||||
WHERE page_id=?
|
||||
GROUP BY block_id, anchor_start, anchor_end, emoji
|
||||
ORDER BY MIN(id)""",
|
||||
(user["id"], page_id),
|
||||
).fetchall()
|
||||
return {"page_id": page_id, "reactions": [dict(r) for r in rows]}
|
||||
|
||||
|
||||
@router.post("/pages/{page_id}/reactions")
|
||||
def toggle_reaction(request: Request, page_id: int, body: dict = Body(default={})):
|
||||
"""Ajoute ou retire la réaction de l'utilisateur sur une plage de texte (toggle)."""
|
||||
user = _current_user(request)
|
||||
block = (body.get("block_id") or "").strip()
|
||||
emoji = (body.get("emoji") or "").strip()
|
||||
try:
|
||||
start = int(body.get("anchor_start"))
|
||||
end = int(body.get("anchor_end"))
|
||||
except (TypeError, ValueError):
|
||||
raise HTTPException(400, "anchor offsets required") from None
|
||||
if not block or not emoji or start < 0 or end <= start:
|
||||
raise HTTPException(400, "block_id, emoji and a non-empty range are required")
|
||||
uid = user["id"]
|
||||
with get_conn() as conn:
|
||||
if not conn.execute("SELECT id FROM pages WHERE id=?", (page_id,)).fetchone():
|
||||
raise HTTPException(404, "Page not found")
|
||||
conn.execute(
|
||||
"INSERT OR IGNORE INTO users (id, login, full_name, is_admin) VALUES (?,?,?,1)",
|
||||
(uid, user.get("login", "admin"), user.get("full_name", "Admin")),
|
||||
)
|
||||
existing = conn.execute(
|
||||
"""SELECT id FROM text_reactions
|
||||
WHERE page_id=? AND block_id=? AND anchor_start=? AND anchor_end=?
|
||||
AND emoji=? AND user_id=?""",
|
||||
(page_id, block, start, end, emoji, uid),
|
||||
).fetchone()
|
||||
if existing:
|
||||
conn.execute("DELETE FROM text_reactions WHERE id=?", (existing["id"],))
|
||||
status = "removed"
|
||||
else:
|
||||
conn.execute(
|
||||
"""INSERT INTO text_reactions
|
||||
(page_id, block_id, anchor_start, anchor_end, emoji, user_id)
|
||||
VALUES (?,?,?,?,?,?)""",
|
||||
(page_id, block, start, end, emoji, uid),
|
||||
)
|
||||
status = "added"
|
||||
conn.commit()
|
||||
return {"status": status, "emoji": emoji}
|
||||
|
||||
@@ -16,6 +16,9 @@
|
||||
|
||||
<style>
|
||||
.fd-icon-picker{position:fixed;top:0;left:0;width:344px;background:var(--bg-modal);border:1px solid var(--border);border-radius:10px;box-shadow:0 8px 32px rgba(0,0,0,.28);z-index:2200;display:flex;flex-direction:column;max-height:440px;overflow:hidden;padding:0;}
|
||||
.fd-icon-picker .fdip-title{display:flex;align-items:center;gap:8px;padding:10px 12px;border-bottom:1px solid var(--border);}
|
||||
.fd-icon-picker .fdip-title-text{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:13px;font-weight:600;color:var(--text-primary);}
|
||||
.fd-icon-picker .fdip-title-grip{opacity:.6;font-size:14px;}
|
||||
.fd-icon-picker .fdip-tabs{display:flex;align-items:center;gap:2px;padding:8px 10px 6px;border-bottom:1px solid var(--border);}
|
||||
.fd-icon-picker .fdip-tab{background:transparent;border:none;color:var(--text-secondary);font-size:13px;padding:5px 10px;border-radius:6px;cursor:pointer;}
|
||||
.fd-icon-picker .fdip-tab:hover{background:var(--bg-hover);}
|
||||
@@ -70,7 +73,11 @@
|
||||
@click.outside="$store.fdIconPicker.customModal || $store.fdIconPicker.close()"
|
||||
@keydown.escape.window="$store.fdIconPicker.close()"
|
||||
:style="'top:' + $store.fdIconPicker.y + 'px;left:' + $store.fdIconPicker.x + 'px'">
|
||||
<div class="fdip-tabs">
|
||||
<div class="fdip-title" x-show="$store.fdIconPicker.title" x-cloak>
|
||||
<span class="fdip-title-text" x-text="$store.fdIconPicker.title"></span>
|
||||
<span class="fdip-title-grip" title="Drag">✋</span>
|
||||
</div>
|
||||
<div class="fdip-tabs" x-show="!$store.fdIconPicker.title">
|
||||
<button class="fdip-tab" :class="{ active: $store.fdIconPicker.tab === 'emoji' }" @click="$store.fdIconPicker.setTab('emoji')">Emoji</button>
|
||||
<button class="fdip-tab" :class="{ active: $store.fdIconPicker.tab === 'icons' }" @click="$store.fdIconPicker.setTab('icons')">Icons</button>
|
||||
<button class="fdip-tab" :class="{ active: $store.fdIconPicker.tab === 'upload' }" @click="$store.fdIconPicker.setTab('upload')">Upload</button>
|
||||
@@ -93,6 +100,15 @@
|
||||
<div class="fdip-body">
|
||||
<template x-if="$store.fdIconPicker.tab === 'emoji'">
|
||||
<div>
|
||||
<!-- v7.64 : mode réaction — les récents au-dessus de la grille (façon Notion) -->
|
||||
<div x-show="$store.fdIconPicker.title && $store.fdIconPicker.category !== 'recent' && !$store.fdIconPicker.query && $store.fdIconPicker.recent.length">
|
||||
<div class="fdip-section">Recent</div>
|
||||
<div class="fdip-grid">
|
||||
<template x-for="e in $store.fdIconPicker.recent.slice(0, 8)" :key="'rt' + e">
|
||||
<button class="fdip-emoji" @click="$store.fdIconPicker.pick($store.fdIconPicker.withTone(e))" x-text="$store.fdIconPicker.withTone(e)"></button>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
<div class="fdip-section" x-show="$store.fdIconPicker.category === 'recent' && !$store.fdIconPicker.query">Recent</div>
|
||||
<div class="fdip-grid">
|
||||
<template x-for="e in $store.fdIconPicker.items()" :key="e">
|
||||
|
||||
@@ -587,15 +587,15 @@
|
||||
💬 Comment
|
||||
</button>
|
||||
|
||||
<!-- ═══════════ Comments drawer (v4.9.0) ═══════════ -->
|
||||
<!-- ═══════════ Comments drawer (v4.9.0 · refonte v7.64 façon Notion) ═══════════ -->
|
||||
<div class="comments-drawer" x-show="commentsOpen" x-cloak x-transition
|
||||
style="position:fixed;top:var(--topbar-height,44px);right:0;bottom:0;width:320px;max-width:92vw;
|
||||
style="position:fixed;top:var(--topbar-height,44px);right:0;bottom:0;width:340px;max-width:92vw;
|
||||
background:var(--bg-primary,#1c1c1c);border-left:1px solid var(--border,#333);
|
||||
box-shadow:-8px 0 30px rgba(0,0,0,.25);z-index:900;display:flex;flex-direction:column;">
|
||||
<div class="comments-drawer-header"
|
||||
style="display:flex;align-items:center;justify-content:space-between;padding:12px 16px;
|
||||
border-bottom:1px solid var(--border,#333);font-weight:600;font-size:14px;">
|
||||
<span>Comments</span>
|
||||
<span>Comments <span style="color:var(--text-dim);font-weight:400;" x-text="'(' + commentCount + ')'"></span></span>
|
||||
<button type="button" class="topbar-btn" @click="toggleComments()" title="Close">✕</button>
|
||||
</div>
|
||||
<div class="comments-drawer-list" style="flex:1;overflow-y:auto;padding:12px 16px;">
|
||||
@@ -603,49 +603,101 @@
|
||||
No comments yet. Select some text and click 💬 Comment.
|
||||
</div>
|
||||
<template x-for="c in comments" :key="c.id">
|
||||
<div class="comment-thread" style="margin-bottom:18px;"
|
||||
:style="c.anchor_block_id ? 'border-left:3px solid var(--accent);padding-left:10px;' : ''">
|
||||
<div style="display:flex;align-items:center;gap:8px;margin-bottom:4px;">
|
||||
<div style="width:22px;height:22px;border-radius:50%;background:#3A3A3A;color:#fff;
|
||||
display:flex;align-items:center;justify-content:center;font-size:11px;font-weight:700;"
|
||||
<div class="comment-thread" :data-thread="c.id"
|
||||
:class="{ 'is-resolved': c.resolved, 'has-anchor': !!c.anchor_block_id }">
|
||||
<div class="ct-head">
|
||||
<div class="ct-avatar"
|
||||
:style="{ background: c.author && c.author.avatar_color ? c.author.avatar_color : '#3A3A3A' }">
|
||||
<span x-text="(c.author ? (c.author.full_name || c.author.login || '?') : '?').charAt(0).toUpperCase()"></span>
|
||||
</div>
|
||||
<span style="font-size:12px;font-weight:600;" x-text="c.author ? (c.author.full_name || c.author.login) : 'Unknown'"></span>
|
||||
<span style="font-size:11px;color:var(--text-dim,#999);margin-left:auto;" x-text="fmtTime(c.created_at)"></span>
|
||||
</div>
|
||||
<div style="font-size:13px;white-space:pre-wrap;margin-bottom:6px;" x-text="c.body"></div>
|
||||
<div style="display:flex;gap:8px;align-items:center;">
|
||||
<button class="btn-sm" style="font-size:11px;" @click="resolveComment(c.id)"
|
||||
x-text="c.resolved ? '↪ Reopen' : '✔ Resolve'"></button>
|
||||
<button class="btn-sm" style="font-size:11px;" x-show="c.user_id === currentUserId"
|
||||
@click="deleteComment(c.id)">🗑 Delete</button>
|
||||
<span class="ct-name" x-text="c.author ? (c.author.full_name || c.author.login) : 'Unknown'"></span>
|
||||
<span class="ct-time" x-text="fmtTime(c.created_at)"></span>
|
||||
<div class="ct-actions">
|
||||
<button type="button" class="ct-act" :title="c.resolved ? 'Reopen' : 'Resolve'"
|
||||
@click="resolveComment(c)"
|
||||
:class="{ 'is-on': c.resolved }">✓</button>
|
||||
<button type="button" class="ct-act" title="More"
|
||||
x-show="c.user_id === currentUserId"
|
||||
@click.stop="commentMenu = commentMenu === c.id ? null : c.id">⋯</button>
|
||||
</div>
|
||||
<div class="ct-menu" x-cloak x-show="commentMenu === c.id" @click.outside="commentMenu = null">
|
||||
<button type="button" class="ct-menu-item" @click="copyCommentLink(c.id)">🔗 Copy link</button>
|
||||
<button type="button" class="ct-menu-item is-danger" @click="deleteComment(c.id)">🗑 Delete</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ct-body" x-text="c.body"></div>
|
||||
<div class="ct-anchor-label" x-show="!!c.anchor_block_id && !c.resolved">💬 on selected text</div>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<div class="comments-drawer-input" style="border-top:1px solid var(--border,#333);padding:12px 16px;">
|
||||
<textarea x-model="commentDraft" rows="2"
|
||||
placeholder="Add a comment... Use @ to mention someone."
|
||||
style="width:100%;background:var(--bg-secondary,#2a2a2a);border:1px solid var(--border,#333);
|
||||
border-radius:8px;color:var(--text);font-size:13px;padding:8px 10px;resize:none;outline:none;"></textarea>
|
||||
<div style="display:flex;justify-content:flex-end;margin-top:8px;">
|
||||
<button class="btn btn-primary" style="font-size:12px;padding:6px 14px;" @click="addPageComment()">Comment</button>
|
||||
<div class="comments-drawer-input">
|
||||
<div class="ct-input-row">
|
||||
<textarea x-model="commentDraft" rows="1"
|
||||
placeholder="Add a comment..."
|
||||
@keydown.enter.exact.prevent="addPageComment()"></textarea>
|
||||
<div class="ct-input-actions">
|
||||
<button type="button" class="ct-act" title="Mention" @click="commentAt()">@</button>
|
||||
<button type="button" class="ct-send" title="Send"
|
||||
:disabled="!(commentDraft || '').trim()" @click="addPageComment()">↑</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ═══════════ Menu contextuel au highlight de texte (v7.62.0, façon Notion) ═══════════ -->
|
||||
<div
|
||||
class="format-toolbar"
|
||||
x-show="fmt.open"
|
||||
x-cloak
|
||||
:style="{top:fmt.top+'px',left:fmt.left+'px'}"
|
||||
@mousedown.prevent
|
||||
>
|
||||
<button @click="fmtApply('bold')"><strong>B</strong></button>
|
||||
<button @click="fmtApply('italic')"><em>I</em></button>
|
||||
<button @click="fmtApply('underline')"><u>U</u></button>
|
||||
<button @click="fmtApply('strikeThrough')"><s>S</s></button>
|
||||
<button @click="fmtLink()">{{ fd_icon("link",14) }}</button>
|
||||
<!-- Ligne 1 : style de texte -->
|
||||
<div class="ft-row">
|
||||
<button type="button" class="ft-item ft-style"
|
||||
@click="fmtStyle($event)"
|
||||
data-tooltip-html="<em>To be the foremost driver…</em><br>Just start writing with plain text">
|
||||
<span class="ft-style-ico">T</span>
|
||||
<span class="ft-style-name" x-text="fmtStyleName()"></span>
|
||||
<span class="ft-caret">›</span>
|
||||
</button>
|
||||
</div>
|
||||
<!-- Ligne 2 : formatage de base -->
|
||||
<div class="ft-row">
|
||||
<button type="button" class="ft-item ft-a" @click="fmtColor($event)" data-tooltip="Color — text and background colors"><span class="ft-a-letter">A</span></button>
|
||||
<button type="button" class="ft-item" @click="fmtApply('bold')" data-tooltip="Bold — Ctrl+B"><strong>B</strong></button>
|
||||
<button type="button" class="ft-item" @click="fmtApply('italic')" data-tooltip="Italic — Ctrl+I"><em>I</em></button>
|
||||
<button type="button" class="ft-item" @click="fmtApply('underline')" data-tooltip="Underline"><u>U</u></button>
|
||||
<button type="button" class="ft-item" @click="fmtApply('strikeThrough')" data-tooltip="Strikethrough"><s>T</s></button>
|
||||
<button type="button" class="ft-item ft-tx" @click="fmtCode()" data-tooltip="Inline code">Tx</button>
|
||||
</div>
|
||||
<!-- Ligne 3 : outils avancés -->
|
||||
<div class="ft-row">
|
||||
<button type="button" class="ft-item" @click="fmtLink()" data-tooltip="Link">{{ fd_icon("link",15) }}</button>
|
||||
<button type="button" class="ft-item" @click="fmtHighlight()" data-tooltip="Highlight"><span class="ft-hl">S</span></button>
|
||||
<button type="button" class="ft-item ft-react" @click="fmtReact()" data-tooltip="React to selected text"><span class="ft-react-ico">🙂<span class="ft-react-plus">+</span></span></button>
|
||||
<button type="button" class="ft-item ft-code-ico" @click="fmtCodeBlock()" data-tooltip="Code block"></></button>
|
||||
<button type="button" class="ft-item" @click="fmtEquation()" data-tooltip="Equation">√x</button>
|
||||
<button type="button" class="ft-item ft-more" @click="fmtMore($event)" data-tooltip="More actions">…</button>
|
||||
</div>
|
||||
<!-- Ligne 4 : actions -->
|
||||
<div class="ft-row">
|
||||
<button type="button" class="ft-item" @click="fmtComment()" data-tooltip="Comment — Ctrl+⇧+M">{{ fd_icon("message-square",15) }}</button>
|
||||
<button type="button" class="ft-item" @click="fmtAskAI()" data-tooltip="Ask AI — Ctrl+J">{{ fd_icon("sparkles",15) }}</button>
|
||||
</div>
|
||||
<!-- Section « Skills » -->
|
||||
<div class="ft-sep"></div>
|
||||
<div class="ft-group">Skills</div>
|
||||
<button type="button" class="ft-item ft-skill" @click="fmtSkill('Improve the writing of this text (wording, clarity, style). Keep the meaning, language and format. Reply ONLY with the improved text.')" data-tooltip="Run on this block">Improve writing</button>
|
||||
<button type="button" class="ft-item ft-skill" @click="fmtSkill('Proofread this text: fix spelling and grammar mistakes only. Reply ONLY with the corrected text.')" data-tooltip="Run on this block">Proofread</button>
|
||||
<button type="button" class="ft-item ft-skill" @click="fmtSkill('Explain this text in simpler terms, in the same language. Reply ONLY with the explanation.')" data-tooltip="Run on this block">Explain</button>
|
||||
<button type="button" class="ft-item ft-skill" @click="fmtSkill('Reformat this text for readability (structure, spacing, lists where useful) without changing its meaning. Reply ONLY with the reformatted text.')" data-tooltip="Run on this block">Reformat</button>
|
||||
<!-- Pied de page -->
|
||||
<div class="ft-sep"></div>
|
||||
<button type="button" class="ft-item ft-foot" @click="fmtEditAI()" data-tooltip="Edit with AI">
|
||||
<span>Edit with AI</span>
|
||||
<kbd>Alt+⇧+E</kbd>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<!-- ═══════════ Copy Link Toast ═══════════ -->
|
||||
|
||||
+93
-2
@@ -2,7 +2,7 @@
|
||||
"openapi": "3.1.0",
|
||||
"info": {
|
||||
"title": "FlowDeck",
|
||||
"version": "7.59.2"
|
||||
"version": "7.64.0"
|
||||
},
|
||||
"paths": {
|
||||
"/auth/register": {
|
||||
@@ -15368,6 +15368,97 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/pages/{page_id}/reactions": {
|
||||
"get": {
|
||||
"tags": [
|
||||
"collaboration"
|
||||
],
|
||||
"summary": "List Reactions",
|
||||
"description": "Réactions regroupées par plage de texte : {block_id, start, end, emoji, count, mine}.",
|
||||
"operationId": "list_reactions_api_pages__page_id__reactions_get",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "page_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"title": "Page Id"
|
||||
}
|
||||
}
|
||||
],
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"post": {
|
||||
"tags": [
|
||||
"collaboration"
|
||||
],
|
||||
"summary": "Toggle Reaction",
|
||||
"description": "Ajoute ou retire la réaction de l'utilisateur sur une plage de texte (toggle).",
|
||||
"operationId": "toggle_reaction_api_pages__page_id__reactions_post",
|
||||
"parameters": [
|
||||
{
|
||||
"name": "page_id",
|
||||
"in": "path",
|
||||
"required": true,
|
||||
"schema": {
|
||||
"type": "integer",
|
||||
"title": "Page Id"
|
||||
}
|
||||
}
|
||||
],
|
||||
"requestBody": {
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"type": "object",
|
||||
"default": {},
|
||||
"title": "Body"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "Successful Response",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"422": {
|
||||
"description": "Validation Error",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/HTTPValidationError"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/custom-emojis": {
|
||||
"get": {
|
||||
"tags": [
|
||||
@@ -30444,4 +30535,4 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,127 @@
|
||||
const { test, expect } = require('@playwright/test');
|
||||
|
||||
/**
|
||||
* v7.62 — menu contextuel au highlight de texte (toolbar façon Notion).
|
||||
* Vérifie : les 4 lignes + Skills + pied, le menu « … », le sous-menu
|
||||
* « Turn into », et surtout la PERSISTANCE du formatage après reload
|
||||
* (sync() relit le DOM formaté via gtMd → source markdown).
|
||||
* Instance de test attendue sur FD_BASE_URL (défaut 8081).
|
||||
*/
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8081';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-secret-123';
|
||||
|
||||
test.use({ serviceWorkers: 'block' });
|
||||
|
||||
async function login(page) {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
const ok = await page
|
||||
.waitForURL('**/workspaces', { timeout: 8000 })
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
if (!ok) {
|
||||
const resp = await page.request.post(`${FD_BASE}/auth/register`, {
|
||||
data: { email: USER, password: PASS, name: 'E2E' },
|
||||
});
|
||||
if (resp.status() !== 409) expect(resp.ok()).toBeTruthy();
|
||||
await page.goto(`${FD_BASE}/workspaces`, { waitUntil: 'domcontentloaded' });
|
||||
}
|
||||
}
|
||||
|
||||
// Sélectionne tout le bloc et simule la fin du glisser-souris
|
||||
async function selectBlock(page) {
|
||||
await page.evaluate(() => {
|
||||
const el = document.querySelector('#_blocksCt [data-bid]');
|
||||
const r = document.createRange();
|
||||
r.selectNodeContents(el);
|
||||
const s = getSelection();
|
||||
s.removeAllRanges();
|
||||
s.addRange(r);
|
||||
el.dispatchEvent(new MouseEvent('mouseup', { bubbles: true }));
|
||||
});
|
||||
await expect(page.locator('.format-toolbar')).toBeVisible({ timeout: 5000 });
|
||||
}
|
||||
|
||||
test('toolbar de sélection : structure, sous-menus, persistance', async ({ page }) => {
|
||||
await login(page);
|
||||
const cookies = await page.context().cookies();
|
||||
const csrf = (cookies.find((c) => c.name === 'csrf_token') || {}).value || '';
|
||||
const created = await page.request.post(
|
||||
`${FD_BASE}/board/api/pages?title=Menu highlight ${Date.now()}`,
|
||||
{ headers: { 'X-CSRF-Token': csrf } }
|
||||
);
|
||||
expect(created.status(), await created.text()).toBeLessThan(400);
|
||||
const { id } = await created.json();
|
||||
|
||||
await page.goto(`${FD_BASE}/pages/${id}`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
await page.click('#_blocksCt [data-bid]');
|
||||
await page.keyboard.type('Menu lors d un highlight de texte');
|
||||
|
||||
// ── 1. structure : 4 lignes + Skills + pied ──
|
||||
await selectBlock(page);
|
||||
const bar = page.locator('.format-toolbar');
|
||||
await expect(bar.locator('.ft-row')).toHaveCount(4);
|
||||
await expect(bar.locator('.ft-style')).toContainText('Normal Text');
|
||||
await expect(bar.locator('.ft-group')).toHaveText('Skills');
|
||||
await expect(bar.locator('.ft-skill')).toHaveCount(4);
|
||||
await expect(bar.locator('.ft-skill').first()).toHaveText('Improve writing');
|
||||
await expect(bar.locator('.ft-foot')).toContainText('Edit with AI');
|
||||
// géométrie : sous la sélection, entièrement dans le viewport
|
||||
const barBox = await bar.boundingBox();
|
||||
const selBox = await page.evaluate(() => {
|
||||
const r = getSelection().getRangeAt(0).getBoundingClientRect();
|
||||
return { bottom: r.bottom };
|
||||
});
|
||||
expect(barBox.y).toBeGreaterThanOrEqual(selBox.bottom);
|
||||
expect(barBox.y + barBox.height).toBeLessThanOrEqual(900);
|
||||
expect(barBox.x).toBeGreaterThanOrEqual(0);
|
||||
expect(barBox.x + barBox.width).toBeLessThanOrEqual(1440);
|
||||
await page.screenshot({ path: 'shots/v762-toolbar.png' });
|
||||
|
||||
// ── 2. ligne 1 → sous-menu « Turn into » ──
|
||||
await bar.locator('.ft-style').click();
|
||||
const sub = page.locator('#blockMenuSub');
|
||||
await expect(sub).toBeVisible();
|
||||
await expect(sub).toContainText('Heading 4');
|
||||
await expect(sub.locator('.bm-check')).toHaveCount(1); // type courant coché
|
||||
await page.screenshot({ path: 'shots/v762-turn-submenu.png' });
|
||||
await page.keyboard.press('Escape');
|
||||
|
||||
// ── 3. « … » → menu contextuel de bloc (recherche + pied) ──
|
||||
await selectBlock(page);
|
||||
await bar.locator('.ft-more').click();
|
||||
const menu = page.locator('#blockMenu');
|
||||
await expect(menu).toBeVisible();
|
||||
await expect(menu.locator('.bm-search')).toHaveAttribute('placeholder', 'Search actions...');
|
||||
await expect(menu).toContainText('Copy link to block');
|
||||
await expect(menu.locator('.bm-foot')).toContainText('Last edited by');
|
||||
await page.screenshot({ path: 'shots/v762-more-menu.png' });
|
||||
await page.keyboard.press('Escape');
|
||||
await expect(menu).toBeHidden();
|
||||
|
||||
// ── 4. persistance : B (gras) survit au reload ──
|
||||
await selectBlock(page);
|
||||
await page.getByRole('button', { name: 'B', exact: true }).click();
|
||||
await expect(page.locator('#_blocksCt [data-bid] b, #_blocksCt [data-bid] strong')).toHaveCount(1);
|
||||
await page.waitForTimeout(2500); // autosave 1,5 s
|
||||
await page.reload({ waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
await expect(page.locator('#_blocksCt [data-bid] strong')).toHaveCount(1); // rendu mdEsc
|
||||
|
||||
// ── 5. persistance : S (surlignage) survit au reload ──
|
||||
await selectBlock(page);
|
||||
await bar.locator('.ft-hl').click();
|
||||
await expect(page.locator('#_blocksCt [data-bid] mark')).toHaveCount(1);
|
||||
await page.waitForTimeout(2500);
|
||||
await page.reload({ waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
await expect(page.locator('#_blocksCt [data-bid] mark')).toHaveCount(1);
|
||||
|
||||
// ── 6. fermeture hors sélection ──
|
||||
await page.mouse.click(10, 400);
|
||||
await expect(page.locator('.format-toolbar')).toBeHidden();
|
||||
});
|
||||
@@ -0,0 +1,125 @@
|
||||
const { test, expect } = require('@playwright/test');
|
||||
|
||||
/**
|
||||
* v7.63 — menus mobiles façon Notion (viewport 390×844) :
|
||||
* - « / » → barre horizontale défilante sous le curseur (15 boutons, ordre du doc)
|
||||
* - « + » → feuille plein écran « Insert block » (titre centré + Cancel, groupes,
|
||||
* raccourcis) → choix d'un type = applySlash
|
||||
* - « Turn into » / « Color » → feuilles réutilisant les sous-menus de bloc
|
||||
* - « More » → menu contextuel de bloc (desktop)
|
||||
* Instance de test attendue sur FD_BASE_URL (défaut 8081).
|
||||
*/
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8081';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-secret-123';
|
||||
|
||||
test.use({ serviceWorkers: 'block', viewport: { width: 390, height: 844 }, hasTouch: true, isMobile: true });
|
||||
|
||||
async function login(page) {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
const ok = await page
|
||||
.waitForURL('**/workspaces', { timeout: 8000 })
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
if (!ok) {
|
||||
const resp = await page.request.post(`${FD_BASE}/auth/register`, {
|
||||
data: { email: USER, password: PASS, name: 'E2E' },
|
||||
});
|
||||
if (resp.status() !== 409) expect(resp.ok()).toBeTruthy();
|
||||
await page.goto(`${FD_BASE}/workspaces`, { waitUntil: 'domcontentloaded' });
|
||||
}
|
||||
}
|
||||
|
||||
async function newPage(page) {
|
||||
const cookies = await page.context().cookies();
|
||||
const csrf = (cookies.find((c) => c.name === 'csrf_token') || {}).value || '';
|
||||
const created = await page.request.post(
|
||||
`${FD_BASE}/board/api/pages?title=Mobile menus ${Date.now()}`,
|
||||
{ headers: { 'X-CSRF-Token': csrf } }
|
||||
);
|
||||
expect(created.status(), await created.text()).toBeLessThan(400);
|
||||
const { id } = await created.json();
|
||||
await page.goto(`${FD_BASE}/pages/${id}`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
return id;
|
||||
}
|
||||
|
||||
test('barre mobile au / + feuilles Insert block / Turn into / More', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page);
|
||||
await page.click('#_blocksCt [data-bid]');
|
||||
await page.keyboard.type('/');
|
||||
|
||||
// ── 1. la barre apparaît, 15 boutons dans l'ordre de la description ──
|
||||
const bar = page.locator('#fdMobileBar');
|
||||
await expect(bar).toBeVisible({ timeout: 5000 });
|
||||
const keys = await page.evaluate(() =>
|
||||
Array.from(document.querySelectorAll('#fdMobileBar [data-mtb]')).map((b) => b.dataset.mtb));
|
||||
expect(keys).toEqual(['plus', 'turn', 'at', 'comment', 'image', 'trash',
|
||||
'left', 'right', 'up', 'down', 'undo', 'redo', 'color', 'more', 'kbd']);
|
||||
// défilement latéral
|
||||
const overflowX = await bar.evaluate((el) => getComputedStyle(el).overflowX);
|
||||
expect(overflowX).toBe('auto');
|
||||
// pas de popup desktop en parallèle
|
||||
await expect(page.locator('#_slashMenu')).toBeHidden();
|
||||
await page.screenshot({ path: 'shots/v763-bar.png' });
|
||||
|
||||
// ── 2. « + » → feuille plein écran « Insert block » ──
|
||||
await bar.locator('[data-mtb="plus"]').click();
|
||||
const sheet = page.locator('.fd-msheet');
|
||||
await expect(sheet).toBeVisible();
|
||||
await expect(sheet.locator('.fd-msheet-title')).toHaveText('Insert block');
|
||||
await expect(sheet.locator('.fd-msheet-cancel')).toHaveText('Cancel');
|
||||
await expect(sheet.locator('.sm-group').first()).toHaveText('Basic blocks');
|
||||
await expect(sheet.locator('.slash-item', { hasText: 'Heading 1' })).toHaveCount(1);
|
||||
await page.screenshot({ path: 'shots/v763-insert.png' });
|
||||
|
||||
// ── 3. choix d'un type → applySlash (le bloc devient un titre) ──
|
||||
await sheet.locator('.slash-item', { hasText: 'Heading 1' }).click();
|
||||
await expect(sheet).toHaveCount(0);
|
||||
await expect(bar).toBeHidden();
|
||||
expect(await page.evaluate(() => window.E.blocks[0].type)).toBe('heading_1');
|
||||
|
||||
// ── 4. « Turn into » → feuille réutilisant les items du sous-menu de bloc ──
|
||||
await page.keyboard.type('/');
|
||||
await expect(bar).toBeVisible();
|
||||
await bar.locator('[data-mtb="turn"]').click();
|
||||
await expect(sheet.locator('.fd-msheet-title')).toHaveText('Turn into');
|
||||
await expect(sheet.locator('.bm-item', { hasText: 'Bulleted list' })).toHaveCount(1);
|
||||
await expect(sheet.locator('.bm-check')).toHaveCount(1); // type courant coché
|
||||
await page.screenshot({ path: 'shots/v763-turn.png' });
|
||||
await sheet.locator('.fd-msheet-cancel').click();
|
||||
await expect(sheet).toHaveCount(0);
|
||||
expect(await page.evaluate(() => window.E.blocks[0].type)).toBe('heading_1');
|
||||
|
||||
// ── 5. « Color » → feuille avec les 3 groupes ──
|
||||
await page.evaluate(() => localStorage.setItem('fdLastBlockColor', 'color|#E5484D'));
|
||||
await bar.locator('[data-mtb="color"]').click();
|
||||
for (const g of ['Last used', 'Text color', 'Background color']) {
|
||||
await expect(sheet.locator('.bm-group', { hasText: g })).toHaveCount(1);
|
||||
}
|
||||
await sheet.locator('.fd-msheet-cancel').click();
|
||||
|
||||
// ── 6. « More » → menu contextuel de bloc (recherche + pied) ──
|
||||
await bar.locator('[data-mtb="more"]').click();
|
||||
const menu = page.locator('#blockMenu');
|
||||
await expect(menu).toBeVisible();
|
||||
await expect(menu.locator('.bm-search')).toHaveAttribute('placeholder', 'Search actions...');
|
||||
await expect(menu.locator('.bm-foot')).toContainText('Last edited by');
|
||||
await page.keyboard.press('Escape');
|
||||
await expect(menu).toBeHidden();
|
||||
|
||||
// ── 7. ↑ déplace réellement le bloc ── (bloc 0 = titre, bloc 1 = paragraphe)
|
||||
await page.click('#_blocksCt [data-bid]'); // bloc 0 (contient '/')
|
||||
await page.keyboard.press('Enter');
|
||||
await page.waitForTimeout(150); // le focus du nouveau bloc est différé (60 ms)
|
||||
await page.keyboard.type('/'); // bloc neuf et vide → slash exact = ouverture
|
||||
await expect(bar).toBeVisible(); // SM._i = 1 (bloc du bas)
|
||||
await bar.locator('[data-mtb="up"]').click();
|
||||
expect(await page.evaluate(() => window.E.blocks.map((b) => b.type).join(',')))
|
||||
.toBe('paragraph,heading_1');
|
||||
await page.screenshot({ path: 'shots/v763-moved.png' });
|
||||
});
|
||||
@@ -0,0 +1,144 @@
|
||||
const { test, expect } = require('@playwright/test');
|
||||
|
||||
/**
|
||||
* v7.64 — commentaires & réactions façon Notion :
|
||||
* - sélection → bouton 🙂+ (« React to selected text ») → sélecteur d'émoji avec
|
||||
* le texte sélectionné en en-tête → pastille + plage jaune, contenu inchangé
|
||||
* - sélection → 💬 → tiroir refondu (avatar, nom, ✓, ⋯, saisie avec @ et ↑) →
|
||||
* fil ancré + plage jaune, clic sur l'ancre rouvre le fil, ✓ résout
|
||||
* - reload : ancres et pastilles repeintes depuis la base
|
||||
* Instance de test attendue sur FD_BASE_URL (défaut 8081).
|
||||
*/
|
||||
const FD_BASE = process.env.FD_BASE_URL || 'http://localhost:8081';
|
||||
const USER = process.env.FD_USER || '[email protected]';
|
||||
const PASS = process.env.FD_PASS || 'e2e-secret-123';
|
||||
|
||||
test.use({ serviceWorkers: 'block' });
|
||||
|
||||
async function login(page) {
|
||||
await page.goto(`${FD_BASE}/auth/login?provider=local`, { waitUntil: 'domcontentloaded' });
|
||||
await page.fill('#email', USER);
|
||||
await page.fill('#password', PASS);
|
||||
await page.click('.btn-primary');
|
||||
const ok = await page
|
||||
.waitForURL('**/workspaces', { timeout: 8000 })
|
||||
.then(() => true)
|
||||
.catch(() => false);
|
||||
if (!ok) {
|
||||
const resp = await page.request.post(`${FD_BASE}/auth/register`, {
|
||||
data: { email: USER, password: PASS, name: 'E2E' },
|
||||
});
|
||||
if (resp.status() !== 409) expect(resp.ok()).toBeTruthy();
|
||||
await page.goto(`${FD_BASE}/workspaces`, { waitUntil: 'domcontentloaded' });
|
||||
}
|
||||
}
|
||||
|
||||
async function newPage(page, body) {
|
||||
const cookies = await page.context().cookies();
|
||||
const csrf = (cookies.find((c) => c.name === 'csrf_token') || {}).value || '';
|
||||
const created = await page.request.post(
|
||||
`${FD_BASE}/board/api/pages?title=Comments ${Date.now()}`,
|
||||
{ headers: { 'X-CSRF-Token': csrf } }
|
||||
);
|
||||
expect(created.status(), await created.text()).toBeLessThan(400);
|
||||
const { id } = await created.json();
|
||||
if (body) {
|
||||
const bs = await page.request.post(`${FD_BASE}/board/api/pages/${id}/blocks`, {
|
||||
headers: { 'X-CSRF-Token': csrf },
|
||||
data: { title: 'Comments', blocks: body },
|
||||
});
|
||||
expect(bs.status(), await bs.text()).toBeLessThan(400);
|
||||
}
|
||||
await page.goto(`${FD_BASE}/pages/${id}`, { waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
return id;
|
||||
}
|
||||
|
||||
// sélectionne tout le bloc et simule la fin du glisser-souris
|
||||
async function selectBlock(page) {
|
||||
await page.evaluate(() => {
|
||||
const el = document.querySelector('#_blocksCt [data-bid]');
|
||||
const r = document.createRange();
|
||||
r.selectNodeContents(el);
|
||||
const s = getSelection();
|
||||
s.removeAllRanges();
|
||||
s.addRange(r);
|
||||
el.dispatchEvent(new MouseEvent('mouseup', { bubbles: true }));
|
||||
});
|
||||
await expect(page.locator('.format-toolbar')).toBeVisible({ timeout: 5000 });
|
||||
}
|
||||
|
||||
test('réaction emoji + commentaires ancrés', async ({ page }) => {
|
||||
await login(page);
|
||||
await newPage(page, [{ id: 'b1', type: 'paragraph', content: 'Prise de reaction a un texte' }]);
|
||||
await expect(page.locator('#_blocksCt [data-bid]')).toHaveText('Prise de reaction a un texte');
|
||||
|
||||
// ── 1. bouton réaction dans la toolbar ──
|
||||
await selectBlock(page);
|
||||
const react = page.locator('.format-toolbar .ft-react');
|
||||
await expect(react).toHaveAttribute('data-tooltip', 'React to selected text');
|
||||
await page.screenshot({ path: 'shots/v764-toolbar-react.png' });
|
||||
await react.click();
|
||||
|
||||
// ── 2. sélecteur : en-tête = texte sélectionné, Filter…, Recent/People ──
|
||||
const picker = page.locator('.fd-icon-picker');
|
||||
await expect(picker).toBeVisible();
|
||||
await expect(picker.locator('.fdip-title-text')).toHaveText('Prise de reaction a un texte');
|
||||
await expect(picker.locator('.fdip-search')).toHaveAttribute('placeholder', 'Filter...');
|
||||
await expect(picker.locator('.fdip-tabs')).toBeHidden(); // mode réaction : emoji only
|
||||
await page.screenshot({ path: 'shots/v764-picker.png' });
|
||||
await picker.locator('.fdip-emoji').first().click();
|
||||
await expect(picker).toBeHidden();
|
||||
|
||||
// ── 3. pastille + plage jaune, contenu du bloc inchangé ──
|
||||
await expect(page.locator('#_blocksCt .fd-react-chip')).toHaveCount(1);
|
||||
await expect(page.locator('#_blocksCt .fd-anchor-react')).toHaveCount(1);
|
||||
const content = await page.evaluate(() => {
|
||||
window.E.sync();
|
||||
return window.E.blocks[0].content;
|
||||
});
|
||||
expect(content).toBe('Prise de reaction a un texte'); // la pastille n'est pas du contenu
|
||||
await page.screenshot({ path: 'shots/v764-chip.png' });
|
||||
|
||||
// ── 4. commentaire : bouton 💬 → tiroir refondu → envoi ──
|
||||
await selectBlock(page);
|
||||
await expect(page.locator('#_commentSelBtn')).toBeVisible();
|
||||
await page.locator('#_commentSelBtn').click();
|
||||
const drawer = page.locator('.comments-drawer');
|
||||
await expect(drawer).toBeVisible();
|
||||
await drawer.locator('textarea').fill('Ceci est mon premier commentaire');
|
||||
await expect(drawer.locator('.ct-send')).toBeEnabled();
|
||||
await drawer.locator('.ct-send').click();
|
||||
const thread = page.locator('.comment-thread');
|
||||
await expect(thread).toHaveCount(1);
|
||||
await expect(thread.locator('.ct-avatar')).toHaveCount(1);
|
||||
await expect(thread.locator('.ct-name')).not.toHaveText('');
|
||||
await expect(thread.locator('.ct-act')).toHaveCount(2); // ✓ + ⋯
|
||||
await expect(thread.locator('.ct-body')).toHaveText('Ceci est mon premier commentaire');
|
||||
await expect(page.locator('#_blocksCt .fd-anchor[data-cid]')).toHaveCount(1);
|
||||
await page.screenshot({ path: 'shots/v764-drawer.png' });
|
||||
|
||||
// ── 5. menu ⋯ du fil (Copy link / Delete) ──
|
||||
await thread.locator('.ct-act').nth(1).click();
|
||||
await expect(thread.locator('.ct-menu')).toBeVisible();
|
||||
await expect(thread.locator('.ct-menu-item').first()).toContainText('Copy link');
|
||||
await page.keyboard.press('Escape');
|
||||
await page.locator('.comments-drawer-header .topbar-btn').click();
|
||||
await expect(drawer).toBeHidden();
|
||||
|
||||
// ── 6. clic sur l'ancre jaune → le fil se rouvre ──
|
||||
await page.locator('#_blocksCt .fd-anchor[data-cid]').click();
|
||||
await expect(drawer).toBeVisible();
|
||||
await expect(page.locator('.comment-thread')).toHaveCount(1);
|
||||
|
||||
// ── 7. ✓ résout le fil (ancre en gris) ──
|
||||
await page.locator('.comment-thread .ct-act').first().click();
|
||||
await expect(page.locator('.comment-thread.is-resolved')).toHaveCount(1);
|
||||
await expect(page.locator('#_blocksCt .fd-anchor.fd-anchor-done')).toHaveCount(1);
|
||||
|
||||
// ── 8. reload : ancres + pastilles rechargées depuis la base ──
|
||||
await page.reload({ waitUntil: 'domcontentloaded' });
|
||||
await page.waitForSelector('#_blocksCt [data-bid]', { timeout: 15000 });
|
||||
await expect(page.locator('#_blocksCt .fd-anchor[data-cid]')).toHaveCount(1, { timeout: 10000 });
|
||||
await expect(page.locator('#_blocksCt .fd-react-chip')).toHaveCount(1, { timeout: 10000 });
|
||||
});
|
||||
+365
-10
@@ -2341,6 +2341,36 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
cursor: grabbing;
|
||||
}
|
||||
|
||||
/* + « ajouter un bloc dessous » — juste à gauche du handle (gouttière 64px) */
|
||||
.block-insert-btn {
|
||||
position: absolute;
|
||||
left: -64px;
|
||||
top: 5px;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
padding: 0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: none;
|
||||
border: none;
|
||||
border-radius: 3px;
|
||||
color: var(--text-dim);
|
||||
font-size: 17px;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
opacity: 0;
|
||||
transition: opacity 0.15s ease;
|
||||
}
|
||||
.block-wrapper:hover .block-insert-btn,
|
||||
.block-wrapper:focus-within .block-insert-btn {
|
||||
opacity: 1;
|
||||
}
|
||||
.block-insert-btn:hover {
|
||||
background: var(--bg-hover);
|
||||
color: var(--text-primary);
|
||||
}
|
||||
|
||||
/* ── v5.10.0: selection multiple + menu contexte bloc ── */
|
||||
.block-wrapper.selected {
|
||||
background: rgba(35,131,226,0.06);
|
||||
@@ -2376,6 +2406,30 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
.block-menu .bm-item.bm-danger .bm-ico { color: #e5484d; }
|
||||
.block-menu .bm-item.bm-danger:hover { background: rgba(229,72,77,.12); }
|
||||
.block-menu .bm-sep { height: 1px; background: var(--border, #2a2a2a); margin: 5px 4px; }
|
||||
/* ── v7.61 : menu contextuel type Notion — recherche, sections, pied, sous-menus ── */
|
||||
.block-menu .bm-group {
|
||||
padding: 9px 9px 3px;
|
||||
font-size: 10px;
|
||||
font-weight: 600;
|
||||
color: var(--text-tertiary);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: .5px;
|
||||
}
|
||||
.block-menu .bm-foot {
|
||||
border-top: 1px solid var(--border, #2a2a2a);
|
||||
margin-top: 6px;
|
||||
padding: 8px 9px 6px;
|
||||
font-size: 11.5px;
|
||||
line-height: 1.55;
|
||||
color: var(--text-tertiary);
|
||||
}
|
||||
.block-menu .bm-check { margin-left: auto; color: var(--accent, #2383e2); font-size: 12px; }
|
||||
.block-menu .bm-item.bm-current { background: var(--bg-secondary); }
|
||||
.block-menu .bm-dot {
|
||||
display: inline-block; width: 12px; height: 12px; border-radius: 3px;
|
||||
border: 1px solid var(--border, #333); vertical-align: -2px;
|
||||
}
|
||||
.block-menu .bm-search:focus { border-color: var(--accent, #2383e2); }
|
||||
.block-menu .bm-colors { padding: 6px 9px; }
|
||||
.block-menu .bm-colors-label { font-size: 10px; font-weight: 600; color: var(--text-tertiary); text-transform: uppercase; letter-spacing: .4px; margin-bottom: 6px; }
|
||||
.block-menu .bm-swatches { display: flex; flex-wrap: wrap; gap: 6px; }
|
||||
@@ -2406,7 +2460,7 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
color: var(--text-secondary); cursor: pointer; font-size: 12px; border-radius: 6px;
|
||||
}
|
||||
.block-menu .bm-cancel:hover { background: var(--bg-hover); }
|
||||
.block-menu-sub { min-width: 180px; max-height: 320px; overflow-y: auto; }
|
||||
.block-menu-sub { min-width: 230px; max-height: 60vh; overflow-y: auto; }
|
||||
|
||||
.ftable-hdr-toggle { margin-left: 12px; font-size: 12px; color: var(--text-tertiary); display:inline-flex; align-items:center; gap:2px; }
|
||||
.ftable-hdr-toggle label { display:inline-flex; align-items:center; gap:4px; cursor:pointer; }
|
||||
@@ -2861,35 +2915,333 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
/* FORMAT TOOLBAR (FLOATING) */
|
||||
/* FORMAT TOOLBAR (FLOATING) — menu contextuel au highlight (v7.62, façon Notion) */
|
||||
.format-toolbar {
|
||||
position: fixed;
|
||||
z-index: 998;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 2px;
|
||||
flex-direction: column;
|
||||
align-items: stretch;
|
||||
gap: 1px;
|
||||
min-width: 216px;
|
||||
max-height: calc(100vh - 16px);
|
||||
overflow-y: auto;
|
||||
background: var(--bg-modal);
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 4px 16px rgba(0,0,0,0.4);
|
||||
padding: 4px 6px;
|
||||
padding: 6px;
|
||||
}
|
||||
|
||||
.format-toolbar button {
|
||||
width: 30px;
|
||||
.format-toolbar .ft-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 2px;
|
||||
}
|
||||
|
||||
.format-toolbar .ft-item {
|
||||
height: 28px;
|
||||
min-width: 28px;
|
||||
padding: 0 7px;
|
||||
border: none;
|
||||
background: transparent;
|
||||
border-radius: 4px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 7px;
|
||||
color: var(--text-primary);
|
||||
font-size: 14px;
|
||||
font-size: 13px;
|
||||
cursor: pointer;
|
||||
transition: background 0.1s;
|
||||
}
|
||||
.format-toolbar button:hover {
|
||||
.format-toolbar .ft-item:hover {
|
||||
background: var(--bg-hover);
|
||||
}
|
||||
.format-toolbar .ft-item svg {
|
||||
display: block;
|
||||
}
|
||||
|
||||
/* Ligne 1 : style de texte (libellé du type de bloc + sous-menu) */
|
||||
.format-toolbar .ft-style {
|
||||
width: 100%;
|
||||
justify-content: flex-start;
|
||||
}
|
||||
.format-toolbar .ft-style-ico {
|
||||
font-weight: 600;
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
.format-toolbar .ft-style-name {
|
||||
flex: 1;
|
||||
text-align: left;
|
||||
}
|
||||
.format-toolbar .ft-caret {
|
||||
color: var(--text-dim);
|
||||
font-size: 15px;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
/* « A » : couleur du texte (barre colorée sous la lettre) */
|
||||
.format-toolbar .ft-a-letter {
|
||||
position: relative;
|
||||
font-weight: 600;
|
||||
}
|
||||
.format-toolbar .ft-a-letter::after {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 1px;
|
||||
right: 1px;
|
||||
bottom: -4px;
|
||||
height: 3px;
|
||||
border-radius: 2px;
|
||||
background: var(--accent);
|
||||
}
|
||||
.format-toolbar .ft-tx,
|
||||
.format-toolbar .ft-code-ico {
|
||||
font-size: 12px;
|
||||
font-family: var(--font-mono, monospace);
|
||||
}
|
||||
.format-toolbar .ft-hl {
|
||||
border-radius: 2px;
|
||||
padding: 0 3px;
|
||||
background: rgba(255,197,61,.28);
|
||||
}
|
||||
.format-toolbar .ft-more {
|
||||
font-size: 16px;
|
||||
letter-spacing: 1px;
|
||||
}
|
||||
|
||||
/* Séparateurs, groupe « Skills », pied de page */
|
||||
.format-toolbar .ft-sep {
|
||||
height: 1px;
|
||||
background: var(--border);
|
||||
margin: 5px 2px;
|
||||
}
|
||||
.format-toolbar .ft-group {
|
||||
font-size: 11px;
|
||||
color: var(--text-dim);
|
||||
padding: 3px 7px 2px;
|
||||
cursor: default;
|
||||
}
|
||||
.format-toolbar .ft-skill {
|
||||
height: 26px;
|
||||
justify-content: flex-start;
|
||||
font-size: 13px;
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
.format-toolbar .ft-foot {
|
||||
height: 26px;
|
||||
width: 100%;
|
||||
justify-content: space-between;
|
||||
font-size: 12px;
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
.format-toolbar .ft-foot kbd {
|
||||
font-family: inherit;
|
||||
font-size: 11px;
|
||||
color: var(--text-dim);
|
||||
}
|
||||
|
||||
/* Info-bulle des éléments du menu de sélection : bulle claire, à droite */
|
||||
.tooltip.tooltip-light {
|
||||
background: #ffffff;
|
||||
border-color: #e3e3e3;
|
||||
color: #191919;
|
||||
box-shadow: 0 4px 12px rgba(0,0,0,0.25);
|
||||
white-space: normal;
|
||||
max-width: 240px;
|
||||
line-height: 1.35;
|
||||
}
|
||||
.tooltip.tooltip-light em {
|
||||
color: #6b6b6b;
|
||||
}
|
||||
|
||||
/* ══ v7.63 — Menus mobiles façon Notion : barre horizontale au « / » ══
|
||||
(défilement latéral) + feuille plein écran Insert block / Turn into / Color ══ */
|
||||
.fd-mtb {
|
||||
position: fixed;
|
||||
z-index: 1300;
|
||||
display: none;
|
||||
gap: 2px;
|
||||
padding: 5px 6px;
|
||||
max-width: calc(100vw - 16px);
|
||||
overflow-x: auto;
|
||||
scrollbar-width: none;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
background: var(--bg-modal);
|
||||
border: 1px solid var(--border-light);
|
||||
border-radius: 10px;
|
||||
box-shadow: 0 6px 20px rgba(0,0,0,.45);
|
||||
}
|
||||
.fd-mtb::-webkit-scrollbar { display: none; }
|
||||
.fd-mtb .fd-mtb-item {
|
||||
flex: 0 0 auto;
|
||||
min-width: 38px;
|
||||
height: 38px;
|
||||
padding: 0 8px;
|
||||
border: none;
|
||||
background: transparent;
|
||||
border-radius: 6px;
|
||||
color: var(--text-primary);
|
||||
font-size: 16px;
|
||||
line-height: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 5px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.fd-mtb .fd-mtb-item:active { background: var(--bg-hover); }
|
||||
.fd-mtb .fd-mtb-wide { font-size: 13px; font-weight: 600; padding: 0 10px; }
|
||||
.fd-mtb .fd-mtb-caret { font-size: 10px; color: var(--text-dim); }
|
||||
|
||||
/* Feuille plein écran (titre centré + Cancel bleu à droite, liste qui défile) */
|
||||
.fd-msheet {
|
||||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 1500;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
background: var(--bg-secondary, #191919);
|
||||
}
|
||||
.fd-msheet-head {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 14px 16px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
.fd-msheet-title { font-size: 15px; font-weight: 600; color: var(--text-primary); }
|
||||
.fd-msheet-cancel {
|
||||
position: absolute;
|
||||
right: 12px;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
background: none;
|
||||
border: none;
|
||||
color: var(--accent, #2383E2);
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
padding: 6px;
|
||||
cursor: pointer;
|
||||
}
|
||||
/* la liste porte la classe block-menu (hérite des styles .bm-item/.bm-group)
|
||||
mais doit couvrir tout l'écran, sans la chrome du menu flottant */
|
||||
.fd-msheet-list.block-menu {
|
||||
max-width: none;
|
||||
min-width: 0;
|
||||
background: none;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
box-shadow: none;
|
||||
padding: 6px 8px 40px;
|
||||
flex: 1 1 auto;
|
||||
overflow-y: auto;
|
||||
-webkit-overflow-scrolling: touch;
|
||||
}
|
||||
.fd-msheet .bm-item { padding: 12px 10px; font-size: 15px; }
|
||||
.fd-msheet .bm-group { padding: 14px 10px 4px; }
|
||||
.fd-msheet .sm-group {
|
||||
padding: 14px 10px 4px;
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
color: var(--text-dim);
|
||||
text-transform: uppercase;
|
||||
letter-spacing: .4px;
|
||||
}
|
||||
.fd-msheet .slash-item { padding: 12px 10px; font-size: 15px; }
|
||||
.fd-msheet .slash-item:active { background: var(--bg-hover); }
|
||||
|
||||
/* ══ v7.64 — Commentaires & réactions façon Notion ══
|
||||
Ancres jaunes (texte commenté), pastilles de réaction, tiroir refondu ══ */
|
||||
.fd-anchor {
|
||||
background: rgba(255, 213, 0, .32);
|
||||
border-radius: 2px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.fd-anchor-done { background: rgba(255, 255, 255, .10); }
|
||||
.fd-anchor-react { background: rgba(255, 213, 0, .28); }
|
||||
.fd-react-chip {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 2px;
|
||||
margin-left: 4px;
|
||||
padding: 0 5px;
|
||||
height: 19px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 10px;
|
||||
background: var(--bg-secondary);
|
||||
cursor: pointer;
|
||||
vertical-align: middle;
|
||||
font-size: 11px;
|
||||
line-height: 1;
|
||||
user-select: none;
|
||||
}
|
||||
.fd-react-chip:hover { background: var(--bg-hover); }
|
||||
.fd-react-chip img { width: 12px; height: 12px; object-fit: contain; }
|
||||
.fd-react-n { font-size: 10px; color: var(--text-dim); }
|
||||
|
||||
/* Tiroir de commentaires (fil + saisie) */
|
||||
.comment-thread {
|
||||
position: relative;
|
||||
margin-bottom: 12px;
|
||||
padding: 10px 12px;
|
||||
background: var(--bg-secondary, #2a2a2a);
|
||||
border: 1px solid var(--border, #333);
|
||||
border-radius: 10px;
|
||||
}
|
||||
.comment-thread.has-anchor { border-left: 3px solid var(--accent, #2383E2); }
|
||||
.comment-thread.is-resolved { opacity: .55; }
|
||||
.thread-flash { outline: 2px solid var(--accent, #2383E2); outline-offset: 2px; }
|
||||
.ct-head { display: flex; align-items: center; gap: 8px; position: relative; }
|
||||
.ct-avatar {
|
||||
width: 24px; height: 24px; border-radius: 50%; color: #fff; flex-shrink: 0;
|
||||
display: flex; align-items: center; justify-content: center; font-size: 11px; font-weight: 700;
|
||||
}
|
||||
.ct-name { font-size: 12px; font-weight: 600; color: var(--text-primary); }
|
||||
.ct-time { font-size: 11px; color: var(--text-dim); margin-left: auto; }
|
||||
.ct-actions { display: flex; gap: 2px; margin-left: 2px; }
|
||||
.ct-act {
|
||||
width: 24px; height: 24px; border: none; background: transparent; border-radius: 5px;
|
||||
color: var(--text-dim); font-size: 13px; line-height: 1; cursor: pointer;
|
||||
}
|
||||
.ct-act:hover { background: var(--bg-hover); color: var(--text-primary); }
|
||||
.ct-act.is-on { color: var(--accent, #2383E2); }
|
||||
.ct-menu {
|
||||
position: absolute; right: 0; top: 28px; z-index: 6; min-width: 156px; padding: 4px;
|
||||
background: var(--bg-modal); border: 1px solid var(--border); border-radius: 8px;
|
||||
box-shadow: 0 8px 24px rgba(0,0,0,.4);
|
||||
}
|
||||
.ct-menu-item {
|
||||
display: block; width: 100%; text-align: left; padding: 7px 10px; font-size: 13px;
|
||||
color: var(--text-primary); background: none; border: none; border-radius: 5px; cursor: pointer;
|
||||
}
|
||||
.ct-menu-item:hover { background: var(--bg-hover); }
|
||||
.ct-menu-item.is-danger { color: #e5484d; }
|
||||
.ct-body { font-size: 13px; white-space: pre-wrap; margin-top: 6px; color: var(--text-primary); }
|
||||
.ct-anchor-label { font-size: 10px; color: var(--text-dim); margin-top: 6px; }
|
||||
.comments-drawer-input { border-top: 1px solid var(--border, #333); padding: 12px 16px; }
|
||||
.ct-input-row { display: flex; gap: 6px; align-items: flex-end; }
|
||||
.ct-input-row textarea {
|
||||
flex: 1; min-width: 0; background: var(--bg-secondary, #2a2a2a);
|
||||
border: 1px solid var(--border, #333); border-radius: 8px; color: var(--text-primary);
|
||||
font-size: 13px; font-family: inherit; line-height: 1.4; padding: 8px 10px; resize: none; outline: none;
|
||||
}
|
||||
.ct-input-row textarea:focus { border-color: var(--accent, #2383E2); }
|
||||
.ct-input-actions { display: flex; gap: 4px; align-items: center; padding-bottom: 2px; }
|
||||
.ct-send {
|
||||
width: 30px; height: 30px; border-radius: 50%; background: var(--accent, #2383E2); color: #fff;
|
||||
border: none; font-size: 15px; line-height: 1; cursor: pointer; flex-shrink: 0;
|
||||
}
|
||||
.ct-send:disabled { opacity: .4; cursor: default; }
|
||||
|
||||
/* Bouton « React to selected text » de la toolbar de sélection */
|
||||
.ft-react-ico { position: relative; font-size: 15px; line-height: 1; }
|
||||
.ft-react-plus {
|
||||
position: absolute; right: -5px; top: -4px; font-size: 9px; font-weight: 700; color: var(--text-dim);
|
||||
}
|
||||
|
||||
/* EDITOR STATUSBAR */
|
||||
.editor-statusbar {
|
||||
@@ -2934,6 +3286,7 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
.page-title-input { font-size: 28px; }
|
||||
.blocks-container { padding: 8px 16px 96px; }
|
||||
.block-handle { display: none; }
|
||||
.block-insert-btn { display: none; }
|
||||
.block-actions { display: none; }
|
||||
.editor-statusbar { left: 0; }
|
||||
}
|
||||
@@ -3409,6 +3762,7 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
.page-cover-area { padding: 32px 32px 8px; }
|
||||
.blocks-container { padding: 8px 32px 80px; }
|
||||
.block-handle { left: -32px; }
|
||||
.block-insert-btn { left: -56px; }
|
||||
.page-title-block::before { left: -32px; }
|
||||
.page-title-input { font-size: 32px; }
|
||||
|
||||
@@ -3499,6 +3853,7 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
.page-title-input { font-size: 24px; }
|
||||
.blocks-container { padding: 8px 16px 96px; }
|
||||
.block-handle { display: none; }
|
||||
.block-insert-btn { display: none; }
|
||||
.block-actions { display: none; }
|
||||
.page-title-block::before { display: none; }
|
||||
.page-title-block .page-icon-emoji { margin-left: 0; }
|
||||
@@ -3586,7 +3941,7 @@ button.breadcrumb-current { max-width: 260px; }
|
||||
.slash-menu { width: 90vw; max-width: 90vw; left: 5vw !important; }
|
||||
|
||||
/* ── Format Toolbar ── */
|
||||
.format-toolbar { left: 8px !important; right: 8px; flex-wrap: wrap; justify-content: center; }
|
||||
.format-toolbar { left: 8px !important; right: 8px; }
|
||||
}
|
||||
|
||||
/* ═══════════════════════════════════════════════════════════
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
if (window.Alpine) window.Alpine.__fdIconPicker = true;
|
||||
|
||||
Alpine.store('fdIconPicker', {
|
||||
open: false, x: 0, y: 0, tab: 'emoji', query: '', category: 'people',
|
||||
open: false, x: 0, y: 0, tab: 'emoji', query: '', category: 'people', title: '',
|
||||
skinTone: 0, toneOpen: false, recent: [], custom: [], customLoaded: false,
|
||||
customModal: false, customName: '', customPreview: '', customFile: null, customBusy: false,
|
||||
onPick: null, onRemove: null, _cx: 0, _cy: 0,
|
||||
@@ -50,6 +50,9 @@
|
||||
opts = opts || {};
|
||||
this.onPick = opts.onPick || null;
|
||||
this.onRemove = opts.onRemove || null;
|
||||
// v7.64 : mode « réaction » — en-tête = texte sélectionné, emoji only
|
||||
this.title = opts.title || '';
|
||||
if (this.title) { this.tab = 'emoji'; this.category = 'people'; }
|
||||
this.query = '';
|
||||
this.toneOpen = false;
|
||||
this.customModal = false;
|
||||
@@ -78,6 +81,7 @@
|
||||
|
||||
close() {
|
||||
this.open = false;
|
||||
this.title = '';
|
||||
this.customModal = false;
|
||||
this.toneOpen = false;
|
||||
this.onPick = null;
|
||||
|
||||
+18
-5
@@ -84,19 +84,32 @@
|
||||
|
||||
// Tooltip system
|
||||
document.addEventListener('mouseover', function(e) {
|
||||
const target = e.target.closest('[data-tooltip]');
|
||||
const target = e.target.closest('[data-tooltip], [data-tooltip-html]');
|
||||
if (!target) return;
|
||||
const tip = document.getElementById('tooltip');
|
||||
if (!tip) return;
|
||||
tip.textContent = target.getAttribute('data-tooltip');
|
||||
const html = target.getAttribute('data-tooltip-html');
|
||||
if (html) tip.innerHTML = html;
|
||||
else tip.textContent = target.getAttribute('data-tooltip') || '';
|
||||
// v7.62 : éléments du menu de sélection → info-bulle claire à droite (façon Notion)
|
||||
const inToolbar = !!target.closest('.format-toolbar');
|
||||
tip.classList.toggle('tooltip-light', inToolbar);
|
||||
tip.style.display = 'block';
|
||||
const rect = target.getBoundingClientRect();
|
||||
tip.style.left = rect.left + 'px';
|
||||
tip.style.top = (rect.bottom + 4) + 'px';
|
||||
if (inToolbar) {
|
||||
tip.style.left = (rect.right + 8) + 'px';
|
||||
tip.style.top = Math.max(8, rect.top + rect.height / 2 - tip.offsetHeight / 2) + 'px';
|
||||
if (rect.right + 8 + tip.offsetWidth > window.innerWidth) {
|
||||
tip.style.left = Math.max(8, rect.left - tip.offsetWidth - 8) + 'px';
|
||||
}
|
||||
} else {
|
||||
tip.style.left = rect.left + 'px';
|
||||
tip.style.top = (rect.bottom + 4) + 'px';
|
||||
}
|
||||
});
|
||||
|
||||
document.addEventListener('mouseout', function(e) {
|
||||
const target = e.target.closest('[data-tooltip]');
|
||||
const target = e.target.closest('[data-tooltip], [data-tooltip-html]');
|
||||
if (!target) return;
|
||||
const tip = document.getElementById('tooltip');
|
||||
if (tip) tip.style.display = 'none';
|
||||
|
||||
@@ -36,7 +36,7 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
// [[fdpage:ID]] / [[fddate:YYYY-MM-DD]] tokens.
|
||||
function gtTok(e){
|
||||
if(!e) return '';
|
||||
if(!e.querySelector||!e.querySelector('.fd-wiki-chip,.fd-wiki-date')) return gt(e);
|
||||
if(!e.querySelector||!e.querySelector('.fd-wiki-chip,.fd-wiki-date,.fd-react-chip')) return gt(e); // le chemin rapide (innerText) inclurait les pastilles
|
||||
let out='';
|
||||
(function walk(node){
|
||||
for(const n of node.childNodes){
|
||||
@@ -44,6 +44,7 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
if(n.nodeType===1){
|
||||
if(n.classList&&n.classList.contains('fd-wiki-chip')){out+=n.getAttribute('data-token')||'';continue;}
|
||||
if(n.classList&&n.classList.contains('fd-wiki-date')){out+=n.getAttribute('data-token')||'';continue;}
|
||||
if(n.classList&&n.classList.contains('fd-react-chip')){continue;} // annotation, pas du contenu
|
||||
if(n.tagName==='BR'){out+='\n';continue;}
|
||||
walk(n);
|
||||
}
|
||||
@@ -52,6 +53,121 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
return out;
|
||||
}
|
||||
window.gtTok=gtTok;
|
||||
// v7.62.0 : lecture d'un bloc vers sa source markdown, en passant par le
|
||||
// DOM formaté (bold/italic/underline/strike/code/mark/liens inline posés
|
||||
// par le menu de sélection). Sans ça, sync() relisait du texte brut et
|
||||
// perdait tout le formatage au prochain render(). Sans balise de mise en
|
||||
// forme, on retombe sur gtTok (comportement identique à l'ancien).
|
||||
function gtMd(e){
|
||||
if(!e) return '';
|
||||
if(!e.querySelector||!e.querySelector('strong,b,em,i,u,s,del,strike,code,mark,a[href]')) return gtTok(e);
|
||||
function w(node){
|
||||
var out='';
|
||||
for(var i=0;i<node.childNodes.length;i++){
|
||||
var n=node.childNodes[i];
|
||||
if(n.nodeType===3){out+=n.nodeValue;continue;}
|
||||
if(n.nodeType!==1)continue;
|
||||
var cl=n.classList;
|
||||
if(cl&&cl.contains('fd-react-chip')){continue;} // annotation, pas du contenu
|
||||
if(cl&&(cl.contains('fd-wiki-chip')||cl.contains('fd-wiki-date'))){out+=n.getAttribute('data-token')||'';continue;}
|
||||
if(n.tagName==='BR'){out+='\n';continue;}
|
||||
if(cl&&cl.contains('fd-math-inline')){out+='$$'+(n.getAttribute('data-tex')||'')+'$$';continue;}
|
||||
var t=n.tagName, inner=w(n);
|
||||
if((t==='STRONG'||t==='B')&&inner){out+='**'+inner+'**';continue;}
|
||||
if((t==='EM'||t==='I')&&inner){out+='*'+inner+'*';continue;}
|
||||
if(t==='U'&&inner){out+='__'+inner+'__';continue;}
|
||||
if((t==='S'||t==='DEL'||t==='STRIKE')&&inner){out+='~~'+inner+'~~';continue;}
|
||||
if(t==='CODE'&&inner&&!(n.hasAttribute&&n.hasAttribute('data-bid'))){out+='`'+inner+'`';continue;}
|
||||
if(t==='MARK'&&inner){out+='=='+inner+'==';continue;}
|
||||
if(t==='A'){var h=n.getAttribute('href')||'';out+=/^https?:/i.test(h)?'['+(inner||h)+']('+h+')':inner;continue;}
|
||||
out+=inner;
|
||||
}
|
||||
return out;
|
||||
}
|
||||
return w(e);
|
||||
}
|
||||
window.gtMd=gtMd;
|
||||
// Enveloppe/désenveloppe une sélection dans une balise inline (code, mark)
|
||||
function _selWrapHost(r,tag){
|
||||
var a=r.startContainer.nodeType===1?r.startContainer:r.startContainer.parentElement;
|
||||
var b=r.endContainer.nodeType===1?r.endContainer:r.endContainer.parentElement;
|
||||
a=a&&a.closest(tag);b=b&&b.closest(tag);
|
||||
if(!a||a!==b)return null;
|
||||
return (a.hasAttribute&&a.hasAttribute('data-bid'))?null:a; // <code> racine d'un bloc code : ne pas dépiler
|
||||
}
|
||||
function _selWrapToggle(tag){
|
||||
var s=window.getSelection();if(!s.rangeCount)return;
|
||||
var r=s.getRangeAt(0);
|
||||
var host=_selWrapHost(r,tag);
|
||||
if(host){var p=host.parentNode;while(host.firstChild)p.insertBefore(host.firstChild,host);p.removeChild(host);p.normalize();return;}
|
||||
var el=document.createElement(tag);
|
||||
try{r.surroundContents(el);}catch(e){el.appendChild(r.extractContents());r.insertNode(el);}
|
||||
var s2=window.getSelection(),nr=document.createRange();
|
||||
nr.selectNodeContents(el);s2.removeAllRanges();s2.addRange(nr);
|
||||
}
|
||||
// v7.64 : marquage d'une plage commentée/réagie (jaune). Ne change pas le
|
||||
// texte lu par sync() : les spans n'ajoutent que des nœuds d'annotation.
|
||||
function _wrapAnchored(el,start,end,cls,attrs){
|
||||
if(!(end>start))return null;
|
||||
let pos=0,sN=null,sO=0,eN=null,eO=0;
|
||||
const walker=document.createTreeWalker(el,NodeFilter.SHOW_TEXT);
|
||||
let n=walker.nextNode();
|
||||
while(n){
|
||||
const len=n.nodeValue.length;
|
||||
if(!sN&&pos+len>start){sN=n;sO=start-pos;}
|
||||
if(sN&&pos+len>=end){eN=n;eO=end-pos;break;}
|
||||
pos+=len;n=walker.nextNode();
|
||||
}
|
||||
if(!sN||!eN)return null;
|
||||
const r=document.createRange();
|
||||
try{r.setStart(sN,sO);r.setEnd(eN,eO);}catch(e){return null;}
|
||||
const span=document.createElement('span');span.className=cls;
|
||||
span.setAttribute('contenteditable','false');
|
||||
if(attrs)for(const k in attrs)span.setAttribute('data-'+k,attrs[k]);
|
||||
try{r.surroundContents(span);}catch(e){try{span.appendChild(r.extractContents());r.insertNode(span);}catch(e2){return null;}}
|
||||
return span;
|
||||
}
|
||||
// Offsets dans le texte SOURCE d'un bloc : les pastilles .fd-react-chip
|
||||
// (annotations) ne comptent pas, comme dans gtTok/gtMd.
|
||||
function _srcNodeLen(node){
|
||||
if(!node)return 0;
|
||||
if(node.nodeType===3){
|
||||
const pe=node.parentElement;
|
||||
if(pe&&pe.closest&&pe.closest('.fd-react-chip'))return 0;
|
||||
return node.nodeValue.length;
|
||||
}
|
||||
if(node.nodeType!==1)return 0;
|
||||
if(node.classList&&node.classList.contains('fd-react-chip'))return 0;
|
||||
let t=0;const kids=node.childNodes;
|
||||
for(let i=0;i<kids.length;i++)t+=_srcNodeLen(kids[i]);
|
||||
return t;
|
||||
}
|
||||
function _srcOffset(root,container,offset){
|
||||
if(!container)return 0;
|
||||
if(container.nodeType===1){
|
||||
let t=0;const kids=container.childNodes;
|
||||
for(let i=0;i<offset&&i<kids.length;i++)t+=_srcNodeLen(kids[i]);
|
||||
return t;
|
||||
}
|
||||
if(container.nodeType!==3)return 0;
|
||||
let t=0;
|
||||
const walker=document.createTreeWalker(root,NodeFilter.SHOW_TEXT);
|
||||
let n;
|
||||
while((n=walker.nextNode())){
|
||||
if(n===container){
|
||||
const pe=n.parentElement;
|
||||
if(pe&&pe.closest&&pe.closest('.fd-react-chip'))return t;
|
||||
return t+Math.max(0,Math.min(offset,n.nodeValue.length));
|
||||
}
|
||||
t+=_srcNodeLen(n);
|
||||
}
|
||||
return t;
|
||||
}
|
||||
function _emojiHtml(v){
|
||||
const s=String(v||'');
|
||||
if(/^(https?:|\/)/.test(s))return '<img src="'+esc(s)+'" alt="">';
|
||||
return esc(s);
|
||||
}
|
||||
function splitCaret(e){
|
||||
const s=window.getSelection(); if(!s.rangeCount||!s.rangeCount)return null; const sel=s.getRangeAt(0);
|
||||
const MK='\uF000FD'; const mark=document.createElement('span'); mark.textContent=MK;
|
||||
@@ -73,6 +189,9 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
.replace(/\*\*([^*]+)\*\*/g,'<strong>$1</strong>')
|
||||
.replace(/\*([^*]+)\*/g,'<em>$1</em>')
|
||||
.replace(/~~([^~]+)~~/g,'<s>$1</s>')
|
||||
.replace(/__([^_]+)__/g,'<u>$1</u>') // souligné (toolbar de sélection)
|
||||
.replace(/==([^=]+)==/g,'<mark>$1</mark>') // surlignage
|
||||
.replace(/\$\$([^$]+)\$\$/g,function(m,t){return '<span class="fd-math-inline" data-tex="'+t.replace(/"/g,'"')+'"></span>';}) // équation inline
|
||||
.replace(/\[\[fdpage:(\d+)\]\]/g,function(m,pid){
|
||||
return '<a class="fd-wiki-chip" contenteditable="false" href="/pages/'+pid+'" data-token="'+m+'" data-pid="'+pid+'" title="Linked page"><span class="fd-wiki-label">…</span></a>';})
|
||||
.replace(/\[\[fddate:([0-9]{4}-[0-9]{2}-[0-9]{2})(?:T[0-9:]{5,8})?\]\]/g,function(m,iso){
|
||||
@@ -266,8 +385,9 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
}
|
||||
|
||||
// ── Block type shortcuts (shown on the right of each slash item) ──
|
||||
const _SHORTCUT={text:'T',heading_1:'#',heading_2:'##',heading_3:'###',heading_4:'####',bulleted_list:'•',numbered_list:'1.',to_do:'[ ]',toggle:'▸',quote:'"',callout:'!',table_of_contents:'TOC',math:'∑',columns:'‖',divider:'———',code:'<>',table:'|',image:'[img]',embed:'[🔗]',bookmark:'[🔖]',video:'[🎬]',audio:'[🎵]',database:'DB',ai_write:'/ai',ai_summarize:'/ai',ai_translate:'/ai',ai_continue:'/ai',duplicate:'Ctrl+D',turn_into:'⋯',copy_link:'#',delete:'⌫'};
|
||||
const _GROUP_LABEL={BASIC:'Basic blocks',AI:'AI writing',MEDIA:'Media',DATA:'Data',ACTIONS:'Actions'};
|
||||
// Raccourcis = préfixes markdown (alignés sur la description mobile Notion : -, [], >, ---)
|
||||
const _SHORTCUT={text:'T',heading_1:'#',heading_2:'##',heading_3:'###',heading_4:'####',bulleted_list:'-',numbered_list:'1.',to_do:'[]',toggle:'>',quote:'"',callout:'!',table_of_contents:'TOC',math:'∑',columns:'‖',divider:'---',code:'<>',table:'|',image:'[img]',embed:'[🔗]',bookmark:'[🔖]',video:'[🎬]',audio:'[🎵]',database:'DB',ai_write:'/ai',ai_summarize:'/ai',ai_translate:'/ai',ai_continue:'/ai',duplicate:'Ctrl+D',turn_into:'⋯',copy_link:'#',delete:'⌫'};
|
||||
const _GROUP_LABEL={BASIC:'Basic blocks',AI:'AI writing',MEDIA:'Media',DATA:'Data',ACTIONS:'Actions',SYNCED:'Synced'};
|
||||
// ── Hover preview card (matches Notion's visual hint) ──
|
||||
function _previewHtml(blockId){
|
||||
const p=function(inner,cls){return '<div class="slash-prev" style="padding:0">'+inner+'</div>';};
|
||||
@@ -311,7 +431,7 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
inp.oninput=()=>SM.flt();
|
||||
e.appendChild(list);e.appendChild(footer);e.appendChild(inp);
|
||||
SM._e=e;SM._in=inp;SM._li=list;SM._f=footer;
|
||||
document.addEventListener('mousedown',ev=>{if(!e.contains(ev.target))SM.close();});
|
||||
document.addEventListener('mousedown',ev=>{if(!e.contains(ev.target)&&!MTB.contains(ev.target))SM.close();});
|
||||
if(!SM._doc){
|
||||
SM._doc=true;
|
||||
document.addEventListener('keydown',function(ev){
|
||||
@@ -336,19 +456,22 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
SM._pv.style.left=left+'px'; SM._pv.style.top=top+'px'; SM._pv.style.display='block';
|
||||
},
|
||||
open(i,el){if(!SM._e)SM.init();SM.close();SM._i=i;SM._s=0;SM._in.value='';SM.flt();
|
||||
// v7.63 : mobile → barre horizontale façon Notion sous le curseur
|
||||
if(_fdMobile()){SM._o=true;MTB.open(i,el);return;}
|
||||
const r=el.getBoundingClientRect();SM._e.style.display='flex';
|
||||
SM._e.style.top=Math.max(4,(r.bottom+4>window.innerHeight-360)?r.top-364:r.bottom+4)+'px';
|
||||
SM._e.style.left=Math.min(r.left,window.innerWidth-340)+'px';
|
||||
SM._rs();setTimeout(()=>SM._in.focus(),10);SM._o=true;},
|
||||
close(){if(SM._e)SM._e.style.display='none';SM._o=false;SM._in&&(SM._in.value='');if(SM._pv)SM._pv.style.display='none';},
|
||||
close(){if(SM._e)SM._e.style.display='none';SM._o=false;SM._in&&(SM._in.value='');if(SM._pv)SM._pv.style.display='none';MTB.close();},
|
||||
// Ligne d'item du slash (partagée par la popup desktop et la feuille mobile)
|
||||
_slashItemHtml(c){return `<div class="slash-item" data-sid="${c.id}" style="display:flex;align-items:center;gap:10px;padding:7px 10px;font-size:14px;color:var(--text-primary);cursor:pointer;border-radius:5px">
|
||||
<span class="slash-item-icon" style="width:26px;height:26px;display:flex;align-items:center;justify-content:center;font-size:15px;background:var(--bg-secondary);border-radius:4px;flex-shrink:0">${c.icon}</span>
|
||||
<span class="slash-item-name" style="flex:1;font-weight:500">${c.name}</span>
|
||||
<span class="slash-item-hint" style="font-size:12px;color:var(--text-dim);font-family:var(--font-mono);opacity:.7">${_SHORTCUT[c.id]||''}</span></div>`;},
|
||||
flt(){if(!SM._li)return;SM._it=[];const q=(SM._in.value||'').toLowerCase();SM._q=q;let h='';
|
||||
for(const g of CMDS){let items=g.items;if(q)items=items.filter(c=>c.name.toLowerCase().includes(q)||c.id.includes(q));if(!items.length)continue;
|
||||
h+=`<div class="sm-group" style="padding:6px 10px 3px;font-size:11px;font-weight:600;color:var(--text-dim);text-transform:uppercase;letter-spacing:.4px">${_GROUP_LABEL[g.name]||g.name}</div>`;
|
||||
items.forEach(c=>{SM._it.push(c);
|
||||
h+=`<div class="slash-item" data-sid="${c.id}" style="display:flex;align-items:center;gap:10px;padding:7px 10px;font-size:14px;color:var(--text-primary);cursor:pointer;border-radius:5px">
|
||||
<span class="slash-item-icon" style="width:26px;height:26px;display:flex;align-items:center;justify-content:center;font-size:15px;background:var(--bg-secondary);border-radius:4px;flex-shrink:0">${c.icon}</span>
|
||||
<span class="slash-item-name" style="flex:1;font-weight:500">${c.name}</span>
|
||||
<span class="slash-item-hint" style="font-size:12px;color:var(--text-dim);font-family:var(--font-mono);opacity:.7">${_SHORTCUT[c.id]||''}</span></div>`;});}
|
||||
items.forEach(c=>{SM._it.push(c);h+=SM._slashItemHtml(c);});}
|
||||
SM._li.innerHTML=h;SM._rs();},
|
||||
_kd(e){if(e.key==='ArrowDown'){e.preventDefault();SM._s=Math.min(SM._s+1,SM._it.length-1);SM._rs();}
|
||||
else if(e.key==='ArrowUp'){e.preventDefault();SM._s=Math.max(SM._s-1,0);SM._rs();}
|
||||
@@ -358,6 +481,64 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
sel(id){if(window.E)window.E.applySlash(id);SM.close();},
|
||||
get isOpen(){return SM._o;}};
|
||||
|
||||
// ═══════════ v7.63.0 — Menus mobiles façon Notion : barre horizontale sous le curseur
|
||||
// + feuille plein écran « Insert block » / « Turn into » / « Color ». Tout est
|
||||
// branché sur les actions existantes (applySlash, turnInto, blockMenu, moveBlock…).
|
||||
function _fdMobile(){try{return window.matchMedia('(max-width: 768px)').matches;}catch(e){return false;}}
|
||||
const MTB={
|
||||
_b:null,_sheet:null,
|
||||
contains(t){return !!t&&((this._b&&this._b.contains(t))||(this._sheet&&this._sheet.contains(t)));},
|
||||
el(){ if(this._b)return this._b;
|
||||
const wide=['plus','turn','color','more'];
|
||||
const items=[['plus','+<span class="fd-mtb-caret">▾</span>'],['turn','Turn into<span class="fd-mtb-caret">▾</span>'],
|
||||
['at','@'],['comment','💬'],['image','🖼️'],['trash','🗑️'],
|
||||
['left','←'],['right','→'],['up','↑'],['down','↓'],['undo','↩'],['redo','↪'],
|
||||
['color','Color<span class="fd-mtb-caret">▾</span>'],['more','More<span class="fd-mtb-caret">▾</span>'],['kbd','⌨️']];
|
||||
const d=document.createElement('div');d.id='fdMobileBar';d.className='fd-mtb';
|
||||
d.innerHTML=items.map(it=>'<button type="button" class="fd-mtb-item'+(wide.indexOf(it[0])>=0?' fd-mtb-wide':'')+'" data-mtb="'+it[0]+'">'+it[1]+'</button>').join('');
|
||||
d.addEventListener('click',ev=>{const bt=ev.target.closest('[data-mtb]');if(bt)MTB.act(bt.getAttribute('data-mtb'),bt);});
|
||||
document.body.appendChild(d);this._b=d;return d;},
|
||||
open(i,el){const d=this.el();d.style.display='flex';
|
||||
const r=el.getBoundingClientRect();
|
||||
const w=Math.min(d.scrollWidth||280,window.innerWidth-16);
|
||||
d.style.left=Math.max(8,Math.min(r.left,window.innerWidth-w-8))+'px';
|
||||
let top=r.bottom+6;if(top+54>window.innerHeight-8)top=Math.max(8,r.top-54);
|
||||
d.style.top=top+'px';d.scrollLeft=0;},
|
||||
close(){if(this._b)this._b.style.display='none';this.closeSheet();},
|
||||
closeSheet(){if(this._sheet){this._sheet.remove();this._sheet=null;}},
|
||||
sheet(title,html,handler){
|
||||
this.closeSheet();
|
||||
const s=document.createElement('div');s.className='fd-msheet';
|
||||
s.innerHTML='<div class="fd-msheet-head"><span class="fd-msheet-title">'+title+'</span><button type="button" class="fd-msheet-cancel">Cancel</button></div><div class="fd-msheet-list block-menu">'+html+'</div>';
|
||||
s.querySelector('.fd-msheet-cancel').addEventListener('click',()=>{const E=window.E;this.closeSheet();if(E&&SM._i>=0&&E.blocks[SM._i])E._focusBid(E.blocks[SM._i].id);});
|
||||
s.addEventListener('click',handler);
|
||||
document.body.appendChild(s);this._sheet=s;},
|
||||
_insertHtml(){let h='';for(const g of CMDS){if(!g.items||!g.items.length)continue;
|
||||
h+='<div class="sm-group">'+(_GROUP_LABEL[g.name]||g.name)+'</div>';
|
||||
g.items.forEach(c=>{h+=SM._slashItemHtml(c);});}return h;},
|
||||
_bmAct(ev){if(!ev.target||!ev.target.closest||!ev.target.closest('[data-bm-act]'))return;_blockMenuClick(ev);this.closeSheet();},
|
||||
act(k,btn){
|
||||
const E=window.E;if(!E)return;
|
||||
const idx=SM._i;const b=(idx>=0&&idx<E.blocks.length)?E.blocks[idx]:null;
|
||||
const bid=b?b.id:'';
|
||||
if(k==='plus'){this.sheet('Insert block',this._insertHtml(),ev=>{const it=ev.target.closest('.slash-item');if(it)SM.sel(it.dataset.sid);});return;}
|
||||
if(k==='turn'){this.sheet('Turn into',_blockTurnItems(bid),ev=>this._bmAct(ev));return;}
|
||||
if(k==='color'){this.sheet('Color',_blockColorItems(bid),ev=>this._bmAct(ev));return;}
|
||||
if(k==='more'){const el=E.getEl(bid);const r=el?el.getBoundingClientRect():btn.getBoundingClientRect();
|
||||
this.close();blockMenuOpen(Math.max(8,Math.min(r.left,window.innerWidth-250)),Math.min(r.bottom+6,window.innerHeight-120),bid);return;}
|
||||
if(k==='kbd'){const a=document.activeElement;if(a&&a.blur)a.blur();return;}
|
||||
if(!b)return;
|
||||
if(k==='at'){const el=E.getEl(bid);if(!el)return;el.focus();document.execCommand('insertText',false,'@');
|
||||
E.dirty=true;E.autoSave();E.openMention(el);return;}
|
||||
if(k==='comment'){E.commentBlock(idx);return;}
|
||||
if(k==='image'){E.applySlash('image');return;}
|
||||
if(k==='trash'){E.deleteSelected(idx);return;}
|
||||
if(k==='up'||k==='down'||k==='left'||k==='right'){E.moveBlock(bid,k);return;}
|
||||
if(k==='undo'){E.undo();return;}
|
||||
if(k==='redo'){E.redo();return;}
|
||||
}
|
||||
};
|
||||
|
||||
// ═══════════ v5.11.0 Wiki-link picker ([[ → page search) ═══════════
|
||||
const WM={_o:false,_idx:-1,_s:0,_it:[],_root:null,_in:null,_li:null,_pv:null,
|
||||
mk(){ if(this._root)return this._root;
|
||||
@@ -609,7 +790,10 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
numAttr=` data-num="${idx-s+1}"`;
|
||||
}
|
||||
const actions=idx>=0?`<div class="block-actions"><button class="block-add-btn" onclick="E.addAfter(${idx})">+</button></div>`:'';
|
||||
// + « ajouter un bloc dessous », juste avant le handle (gouttière 64px)
|
||||
const insertBtn=idx>=0?`<button type="button" class="block-insert-btn" title="Add block below" aria-label="Add block below" onclick="E.addAfter(${idx})">+</button>`:'';
|
||||
return `<div class="block-wrapper" data-id="${b.id}">
|
||||
${insertBtn}
|
||||
<div class="block-handle"><svg viewBox="0 0 16 16" width="14" height="14"><circle cx="4" cy="3" r="1.3"/><circle cx="11" cy="3" r="1.3"/><circle cx="4" cy="8" r="1.3"/><circle cx="11" cy="8" r="1.3"/><circle cx="4" cy="13" r="1.3"/><circle cx="11" cy="13" r="1.3"/></svg></div>
|
||||
${actions}
|
||||
<${tag}${style}${bidAttr}${numAttr} class="${cls}">${inner}</${tag}>
|
||||
@@ -918,74 +1102,222 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
{id:'numbered_list',name:'Numbered list'},{id:'to_do',name:'To-do'},{id:'toggle',name:'Toggle'},
|
||||
{id:'quote',name:'Quote'},{id:'callout',name:'Callout'},{id:'table',name:'Table'},
|
||||
{id:'math',name:'Math equation'},{id:'columns',name:'Column list'},{id:'button',name:'Button / Automation'},
|
||||
{id:'code',name:'Code block'}
|
||||
{id:'code',name:'Code block'},{id:'synced',name:'Synced block'}
|
||||
];
|
||||
const _BLOCK_COLORS_TEXT=['default','#E5484D','#F76B15','#FFC53D','#46A758','#3E63DD','#8E4EC6','#12A594','#94A3B8'];
|
||||
const _BLOCK_COLORS_BG=['default','rgba(229,72,77,.15)','rgba(247,107,21,.15)','rgba(255,197,61,.15)','rgba(70,154,88,.15)','rgba(62,99,221,.15)','rgba(142,78,198,.15)','rgba(18,165,148,.15)','rgba(148,163,184,.2)'];
|
||||
function _blockMenuClose(){var m=document.getElementById('blockMenu');if(m)m.remove();m=document.getElementById('blockMenuSub');if(m)m.remove();}
|
||||
// Sous-menu « Turn into » — ordre Notion ; id ∈ _BLOCK_TURN_TYPES, cols = nb de colonnes
|
||||
const _BLOCK_TURN_MENU=[
|
||||
{id:'paragraph',name:'Text',icon:'T'},{id:'heading_1',name:'Heading 1',icon:'H1'},
|
||||
{id:'heading_2',name:'Heading 2',icon:'H2'},{id:'heading_3',name:'Heading 3',icon:'H3'},
|
||||
{id:'heading_4',name:'Heading 4',icon:'H4'},{id:'bulleted_list',name:'Bulleted list',icon:'•'},
|
||||
{id:'numbered_list',name:'Numbered list',icon:'1.'},{id:'to_do',name:'To-do list',icon:'☑'},
|
||||
{id:'toggle',name:'Toggle list',icon:'▸'},{id:'code',name:'Code',icon:'</>'},
|
||||
{id:'quote',name:'Quote',icon:'”'},{id:'callout',name:'Callout',icon:'ⓘ'},
|
||||
{id:'math',name:'Block equation',icon:'∑'},{id:'synced',name:'Synced block',icon:'⛓'},
|
||||
{id:'columns',name:'2 columns',icon:'▦',cols:2},{id:'columns',name:'3 columns',icon:'▦',cols:3},
|
||||
{id:'columns',name:'4 columns',icon:'▦',cols:4},{id:'columns',name:'5 columns',icon:'▦',cols:5}
|
||||
];
|
||||
// Couleurs texte/fond alignées par index — noms Notion (Dernière utilisée ailleurs)
|
||||
const _BLOCK_COLOR_NAMES=['Default','Gray','Brown','Orange','Yellow','Green','Blue','Purple','Pink','Red'];
|
||||
const _BLOCK_COLORS_TEXT=['default','#94A3B8','#8A6642','#F76B15','#FFC53D','#46A758','#3E63DD','#8E4EC6','#E5539B','#E5484D'];
|
||||
const _BLOCK_COLORS_BG=['default','rgba(148,163,184,.15)','rgba(138,102,66,.15)','rgba(247,107,21,.15)','rgba(255,197,61,.15)','rgba(70,154,88,.15)','rgba(62,99,221,.15)','rgba(142,78,198,.15)','rgba(229,83,155,.15)','rgba(229,72,77,.15)'];
|
||||
// Raccourcis affichés — implémentés par le handler clavier en bas de fichier
|
||||
const _BM_SHORTCUTS={link:'Alt+⇧+L',duplicate:'Ctrl+D',move:'Ctrl+⇧+P',delete:'Del',comment:'Ctrl+⇧+M',suggest:'Ctrl+⇧+Alt+X',ai:'Ctrl+J',color:'Ctrl+⇧+H'};
|
||||
var _bmSubKind='',_bmSubTimer=null;
|
||||
function _blockMenuClose(){var m=document.getElementById('blockMenu');if(m)m.remove();m=document.getElementById('blockMenuSub');if(m)m.remove();clearTimeout(_bmSubTimer);_bmSubKind='';}
|
||||
function _blockAttr(s){return String(s==null?'':s).replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"').replace(/'/g,''');}
|
||||
function _blockMenuBid(){var m=document.getElementById('blockMenu');return m?(m.getAttribute('data-bid')||''):'';}
|
||||
// Sous-menu ouvert au survol de l'entrée correspondante (panneau de droite)
|
||||
function _blockSubOpen(kind,bid,anchor){
|
||||
if(!kind||!bid)return;
|
||||
var m=document.getElementById('blockMenu');if(!m)return;
|
||||
if(_bmSubKind===kind&&document.getElementById('blockMenuSub'))return;
|
||||
clearTimeout(_bmSubTimer);_bmSubKind=kind;
|
||||
var r=m.getBoundingClientRect();
|
||||
var a=anchor&&anchor.getBoundingClientRect?anchor.getBoundingClientRect():r;
|
||||
var top=Math.max(8,Math.min(a.top,window.innerHeight-60));
|
||||
if(kind==='turn')_blockTurnMenuOpen(r.right+4,top,bid);
|
||||
else if(kind==='color')_blockColorMenuOpen(r.right+4,top,bid);
|
||||
else if(kind==='skills')_blockSkillsMenuOpen(r.right+4,top,bid);
|
||||
var s=document.getElementById('blockMenuSub');
|
||||
if(s){s.addEventListener('mouseenter',function(){clearTimeout(_bmSubTimer);});
|
||||
s.addEventListener('mouseleave',function(){_blockSubCloseLater();});}
|
||||
}
|
||||
function _blockSubCloseLater(){clearTimeout(_bmSubTimer);_bmSubTimer=setTimeout(function(){var s=document.getElementById('blockMenuSub');if(s&&!s.matches(':hover')){s.remove();_bmSubKind='';}},260);}
|
||||
// Sous-menu ouvert depuis la toolbar de sélection (pas de #blockMenu parent)
|
||||
function _subHoverClose(){var s=document.getElementById('blockMenuSub');if(s)s.addEventListener('mouseleave',function(){_blockSubCloseLater();});}
|
||||
function _blockMenuClick(ev){
|
||||
var t=ev.target.closest&&ev.target.closest('[data-bm-act]');if(!t)return;
|
||||
var act=t.getAttribute('data-bm-act');var bid=t.getAttribute('data-bid');
|
||||
var act=t.getAttribute('data-bm-act');var bid=t.getAttribute('data-bid')||_blockMenuBid();
|
||||
if(!act)return;
|
||||
ev.preventDefault();ev.stopPropagation();
|
||||
var E=window.E;if(!E)return;
|
||||
var idx=bid?E.getIdx(bid):-1;
|
||||
if(act==='turn'){var m=document.getElementById('blockMenu');if(m){var r=m.getBoundingClientRect();_blockTurnMenuOpen(r.right+4,r.top,bid||'');}return;}
|
||||
if(act==='submenu'){_blockSubOpen(t.getAttribute('data-sub'),bid,t);return;}
|
||||
if(act==='duplicate'){E.duplicateBlock(idx);}
|
||||
else if(act==='copy-link'){E.copyBlockLink(bid||'');}
|
||||
else if(act==='copy-blocks'){E.copySelectedBlocks();}
|
||||
else if(act==='cut-blocks'){E.cutSelectedBlocks();}
|
||||
else if(act==='paste-blocks'){E.pasteBlocks();}
|
||||
else if(act==='move-to'){_blockMoveToOpen(idx);}
|
||||
else if(act==='delete'){E.deleteSelected(idx);}
|
||||
else if(act==='comment'){E.commentBlock(idx);}
|
||||
else if(act==='suggest'){E.suggestEdit(idx);}
|
||||
else if(act==='ai'){E.askAIBlock(idx);}
|
||||
else if(act==='skill'){E.runSkill(idx,t.getAttribute('data-prompt')||'');}
|
||||
else if(act==='color'){var key=t.getAttribute('data-color-key'),val=t.getAttribute('data-color-val');E.setBlockColor(idx,key,val);}
|
||||
else if(act==='turn-type'){E.turnInto(idx,t.getAttribute('data-type'));_blockMenuClose();}
|
||||
else if(act==='turn-type'){E.turnInto(idx,t.getAttribute('data-type'),parseInt(t.getAttribute('data-cols')||'0',10)||0);_blockMenuClose();return;}
|
||||
_blockMenuClose();
|
||||
}
|
||||
function _blockMenuItem(act,icon,label,opts){
|
||||
opts=opts||{};
|
||||
var attr=' data-bm-act="'+act+'"';
|
||||
if(opts.bid)attr+=' data-bid="'+_blockAttr(opts.bid)+'"';
|
||||
if(opts.sub)attr+=' data-sub="'+opts.sub+'"';
|
||||
if(opts.colorKey)attr+=' data-color-key="'+opts.colorKey+'" data-color-val="'+_blockAttr(opts.colorVal||'')+'"';
|
||||
if(opts.prompt!=null)attr+=' data-prompt="'+_blockAttr(opts.prompt)+'"';
|
||||
if(opts.type)attr+=' data-type="'+opts.type+'"';
|
||||
if(opts.cols)attr+=' data-cols="'+opts.cols+'"';
|
||||
if(opts.title)attr+=' title="'+_blockAttr(opts.title)+'"';
|
||||
var right=opts.check?'<span class="bm-check">✓</span>'
|
||||
:(opts.sub?'<span class="bm-arrow">▸</span>'
|
||||
:(opts.shortcut?'<span class="bm-hint">'+opts.shortcut+'</span>':''));
|
||||
return '<div class="bm-item'+(opts.danger?' bm-danger':'')+(opts.current?' bm-current':'')+'"'+attr+'>'
|
||||
+(icon!=null?'<span class="bm-ico">'+icon+'</span>':'')+label+right+'</div>';
|
||||
}
|
||||
// Métadonnées du pied de page : auteur / heure de dernière édition / taille du bloc
|
||||
function _blockMenuMeta(b){
|
||||
var E=window.E||{};
|
||||
var who='';
|
||||
try{var n=document.querySelector('.um-name')||document.querySelector('.workspace-name');who=n?(n.textContent||'').trim():'';}catch(e){}
|
||||
var when='';
|
||||
if(E.updatedAt){var d=new Date(E.updatedAt);if(!isNaN(d)){
|
||||
var same=d.toDateString()===new Date().toDateString();
|
||||
var hm=d.toLocaleTimeString([],{hour:'numeric',minute:'2-digit'});
|
||||
when=(same?'Today at ':(d.toLocaleDateString([])+' at '))+hm;}}
|
||||
var content=(b&&b.content)||'';
|
||||
var trimmed=content.trim();
|
||||
var words=trimmed?trimmed.split(/\s+/).length:0;
|
||||
return '<div class="bm-foot"><div>Last edited by '+esc(who||'you')+'</div>'
|
||||
+(when?'<div>'+esc(when)+'</div>':'')
|
||||
+'<div>'+words+' word'+(words===1?'':'s')+', '+content.length+' character'+(content.length===1?'':'s')+'</div></div>';
|
||||
}
|
||||
function blockMenuOpen(x,y,bid){
|
||||
_blockMenuClose();
|
||||
var E=window.E;if(!E)return;
|
||||
var idx=E.getIdx(bid);if(idx<0)return;
|
||||
var b=E.blocks[idx];if(!b)return;
|
||||
var d=document.createElement('div');d.id='blockMenu';d.className='block-menu';d.style.cssText='position:fixed;z-index:4000;';
|
||||
var colorsText='',colorsBg='';
|
||||
_BLOCK_COLORS_TEXT.forEach(function(c){colorsText+='<button type="button" data-bm-act="color" data-color-key="color" data-color-val="'+c+'" title="Text color" style="background:'+(c==='default'?'transparent':c)+'" class="bm-swatch'+(c==='default'?' bm-default':'')+'">'+(c==='default'?'A':'')+'</button>';});
|
||||
_BLOCK_COLORS_BG.forEach(function(c){colorsBg+='<button type="button" data-bm-act="color" data-color-key="bgColor" data-color-val="'+c+'" title="Background color" style="background:'+(c==='default'?'transparent':c)+'" class="bm-swatch'+(c==='default'?' bm-default':'')+'"></button>';});
|
||||
d.innerHTML='<div class="bm-item" data-bm-act="turn" data-bid="'+b.id+'"><span class="bm-ico">↩</span>Turn into<span class="bm-arrow">▸</span></div>'
|
||||
+'<div class="bm-sep"></div>'
|
||||
+'<div class="bm-item" data-bm-act="duplicate" data-bid="'+b.id+'"><span class="bm-ico">▣</span>Duplicate <span class="bm-hint">'+(_rtMac()?'⌘D':'Ctrl+D')+'</span></div>'
|
||||
+'<div class="bm-item" data-bm-act="copy-link" data-bid="'+b.id+'"><span class="bm-ico">🔗</span>Copy link to block</div>'
|
||||
+'<div class="bm-sep"></div>'
|
||||
+'<div class="bm-item" data-bm-act="copy-blocks" data-bid="'+b.id+'"><span class="bm-ico">⎘</span>Copy blocks <span class="bm-hint">'+(_rtMac()?'⌘C':'Ctrl+C')+'</span></div>'
|
||||
+'<div class="bm-item" data-bm-act="cut-blocks" data-bid="'+b.id+'"><span class="bm-ico">✂</span>Cut blocks <span class="bm-hint">'+(_rtMac()?'⌘X':'Ctrl+X')+'</span></div>'
|
||||
+'<div class="bm-item" data-bm-act="paste-blocks" data-bid="'+b.id+'"><span class="bm-ico">⎘</span>Paste blocks <span class="bm-hint">'+(_rtMac()?'⌘V':'Ctrl+V')+'</span></div>'
|
||||
+'<div class="bm-sep"></div>'
|
||||
+'<div class="bm-item" data-bm-act="move-to" data-bid="'+b.id+'"><span class="bm-ico">↪</span>Move to…</div>'
|
||||
+'<div class="bm-sep"></div>'
|
||||
+'<div class="bm-colors"><div class="bm-colors-label">Text</div><div class="bm-swatches">'+colorsText+'</div></div>'
|
||||
+'<div class="bm-colors"><div class="bm-colors-label">Background</div><div class="bm-swatches">'+colorsBg+'</div></div>'
|
||||
+'<div class="bm-sep"></div>'
|
||||
+'<div class="bm-item bm-danger" data-bm-act="delete" data-bid="'+b.id+'"><span class="bm-ico">✕</span>Delete <span class="bm-hint">⌫</span></div>';
|
||||
var d=document.createElement('div');d.id='blockMenu';d.className='block-menu';d.setAttribute('data-bid',b.id);d.style.cssText='position:fixed;z-index:4000;';
|
||||
var S=_BM_SHORTCUTS;
|
||||
d.innerHTML='<input class="bm-search" type="text" placeholder="Search actions..." autocomplete="off" spellcheck="false">'
|
||||
+'<div class="bm-group">Text</div>'
|
||||
+_blockMenuItem('submenu','↩','Turn into',{sub:'turn'})
|
||||
+_blockMenuItem('submenu','🎨','Color',{sub:'color'})
|
||||
+_blockMenuItem('link','🔗','Copy link to block',{shortcut:S.link})
|
||||
+_blockMenuItem('duplicate','▣','Duplicate',{shortcut:S.duplicate})
|
||||
+_blockMenuItem('move-to','↪','Move to…',{shortcut:S.move})
|
||||
+_blockMenuItem('delete','✕','Delete',{shortcut:S.delete,danger:true})
|
||||
+_blockMenuItem('comment','💬','Comment',{shortcut:S.comment})
|
||||
+_blockMenuItem('suggest','✎','Suggest edits',{shortcut:S.suggest})
|
||||
+_blockMenuItem('ai','✨','Ask AI',{shortcut:S.ai})
|
||||
+_blockMenuItem('submenu','📚','Skills',{sub:'skills'})
|
||||
+_blockMenuMeta(b);
|
||||
d.addEventListener('click',_blockMenuClick);
|
||||
d.addEventListener('input',function(ev){
|
||||
if(!ev.target.classList||!ev.target.classList.contains('bm-search'))return;
|
||||
var q=(ev.target.value||'').toLowerCase();
|
||||
d.querySelectorAll('.bm-item').forEach(function(it){
|
||||
it.style.display=(q&&it.textContent.toLowerCase().indexOf(q)<0)?'none':'';
|
||||
});
|
||||
var g=d.querySelector('.bm-group');if(g)g.style.display=q?'none':'';
|
||||
});
|
||||
d.addEventListener('mouseover',function(ev){
|
||||
var it=ev.target&&ev.target.closest?ev.target.closest('[data-sub]'):null;
|
||||
if(it)_blockSubOpen(it.getAttribute('data-sub'),b.id,it);
|
||||
});
|
||||
d.addEventListener('mouseleave',function(){_blockSubCloseLater();});
|
||||
d.addEventListener('contextmenu',function(ev){ev.preventDefault();_blockMenuClose();});
|
||||
document.body.appendChild(d);
|
||||
var r=d.getBoundingClientRect();
|
||||
x=Math.min(Math.max(8,x),window.innerWidth-r.width-8);
|
||||
y=Math.min(Math.max(8,y),window.innerHeight-r.height-8);
|
||||
d.style.left=x+'px';d.style.top=y+'px';
|
||||
var si=d.querySelector('.bm-search');if(si)setTimeout(function(){si.focus();},10);
|
||||
}
|
||||
function _blockTurnMenuOpen(x,y,bid){
|
||||
// Panneau de droite : coquille commune des 3 sous-menus
|
||||
function _blockSubShell(x,y){
|
||||
var m=document.getElementById('blockMenuSub');if(m)m.remove();
|
||||
var d=document.createElement('div');d.id='blockMenuSub';d.className='block-menu block-menu-sub';d.style.cssText='position:fixed;z-index:4001;';
|
||||
var html='';
|
||||
_BLOCK_TURN_TYPES.forEach(function(t){html+='<div class="bm-item" data-bm-act="turn-type" data-type="'+t.id+'" data-bid="'+bid+'">'+t.name+'</div>';});
|
||||
d.innerHTML=html;
|
||||
d.addEventListener('click',_blockMenuClick);
|
||||
document.body.appendChild(d);
|
||||
var r=d.getBoundingClientRect();
|
||||
x=Math.min(Math.max(8,x),window.innerWidth-r.width-8);
|
||||
y=Math.min(Math.max(8,y),window.innerHeight-r.height-8);
|
||||
d.style.left=x+'px';d.style.top=y+'px';
|
||||
return d;
|
||||
}
|
||||
function _blockTurnItems(bid){
|
||||
var E=window.E;var cur='';
|
||||
if(E){var i=E.getIdx(bid);if(i>=0&&E.blocks[i])cur=E.blocks[i].type||'';}
|
||||
var html='';
|
||||
_BLOCK_TURN_MENU.forEach(function(t){
|
||||
var on=(t.id===cur&&!t.cols);
|
||||
html+=_blockMenuItem('turn-type',t.icon,t.name,{bid:bid,type:t.id,cols:t.cols,
|
||||
title:t.cols?('Create '+t.cols+' columns of blocks'):'',
|
||||
check:on,current:on});
|
||||
});
|
||||
return html;
|
||||
}
|
||||
function _blockTurnMenuOpen(x,y,bid){
|
||||
var d=_blockSubShell(x,y);
|
||||
d.innerHTML=_blockTurnItems(bid);
|
||||
}
|
||||
function _blockColorItems(bid){
|
||||
var E=window.E;var idx=E?E.getIdx(bid):-1;var b=idx>=0?E.blocks[idx]:null;
|
||||
var curT=(b&&b.style&&b.style.color)||'default';
|
||||
var curB=(b&&b.style&&b.style.bgColor)||'default';
|
||||
var last='';try{last=localStorage.getItem('fdLastBlockColor')||'';}catch(e){}
|
||||
var html='';
|
||||
if(last){
|
||||
var i=last.indexOf('|');var lk=i<0?'color':last.slice(0,i);var lv=last.slice(i+1);
|
||||
var isBg=(lk==='bgColor');
|
||||
var arr=isBg?_BLOCK_COLORS_BG:_BLOCK_COLORS_TEXT;
|
||||
var ni=arr.indexOf(lv);
|
||||
var nm=(ni>=0?_BLOCK_COLOR_NAMES[ni]:'Custom')+(isBg?' background':' text');
|
||||
html+='<div class="bm-group">Last used</div>'
|
||||
+_blockMenuItem('color','<span style="color:'+(lv==='default'?'var(--text-secondary)':lv)+'">A</span>',
|
||||
nm,{bid:bid,colorKey:lk,colorVal:lv,shortcut:_BM_SHORTCUTS.color});
|
||||
}
|
||||
html+='<div class="bm-group">Text color</div>';
|
||||
_BLOCK_COLORS_TEXT.forEach(function(v,n){
|
||||
html+=_blockMenuItem('color','<span style="color:'+(v==='default'?'var(--text-secondary)':v)+'">A</span>',
|
||||
_BLOCK_COLOR_NAMES[n]+' text',{bid:bid,colorKey:'color',colorVal:v,
|
||||
check:v===curT,current:v===curT});
|
||||
});
|
||||
html+='<div class="bm-group">Background color</div>';
|
||||
_BLOCK_COLORS_BG.forEach(function(v,n){
|
||||
html+=_blockMenuItem('color','<span class="bm-dot" style="background:'+(v==='default'?'var(--text-tertiary)':v)+'"></span>',
|
||||
_BLOCK_COLOR_NAMES[n]+' background',{bid:bid,colorKey:'bgColor',colorVal:v,
|
||||
check:v===curB,current:v===curB});
|
||||
});
|
||||
return html;
|
||||
}
|
||||
function _blockColorMenuOpen(x,y,bid){
|
||||
var d=_blockSubShell(x,y);
|
||||
d.innerHTML=_blockColorItems(bid);
|
||||
}
|
||||
function _blockSkillsMenuOpen(x,y,bid){
|
||||
var d=_blockSubShell(x,y);
|
||||
d.innerHTML='<div class="bm-empty">Chargement…</div>';
|
||||
fetch('/api/agent/skills',{credentials:'same-origin'})
|
||||
.then(function(r){return r.json();})
|
||||
.then(function(res){
|
||||
if(!document.body.contains(d))return;
|
||||
var list=(res&&res.skills)||[];
|
||||
if(!list.length){d.innerHTML='<div class="bm-empty">Aucune compétence enregistrée — créez-en une dans le panneau Agent.</div>';return;}
|
||||
var html='';
|
||||
list.forEach(function(s){
|
||||
html+=_blockMenuItem('skill','📚',esc(String(s.name||'Skill')),{bid:bid,prompt:s.prompt_template||''});
|
||||
});
|
||||
d.innerHTML=html;
|
||||
})
|
||||
.catch(function(){if(document.body.contains(d))d.innerHTML='<div class="bm-empty">Compétences indisponibles.</div>';});
|
||||
}
|
||||
function _rtMac(){return /Mac|iPhone|iPad/.test(navigator.userAgent);}
|
||||
function _blockMoveToOpen(idx){
|
||||
@@ -1044,7 +1376,7 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
inviteEmail:'',invitePermission:'edit',inviteUserId:null,inviteGroupId:null,inviteGroups:[],inviteUsers:[],inviteSuggestOpen:false,inviteSel:-1,accessList:[],
|
||||
toastVisible:false,toastMsg:'',
|
||||
// ── v4.9.0: Collaboration — comments & mentions ──
|
||||
commentsOpen:false,commentDraft:'',comments:[],commentCount:0,
|
||||
commentsOpen:false,commentDraft:'',comments:[],commentCount:0,reactions:[],commentMenu:null,
|
||||
currentUserId:PD.user_id||0,
|
||||
_commentSel:{range:null,bid:null,start:0,end:0},
|
||||
_notifiedMentions:{},
|
||||
@@ -1096,6 +1428,7 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
this.insertTable=function(){this.sync();this.pushHistory();var nb={id:genId(),type:'table',content:'',rows:_tblNew(3,3)};this.blocks.push(nb);this.dirty=true;this.autoSave();this.render();_rtSync();setTimeout(function(){_tblFocus(nb.id,0,0);},60);};
|
||||
SM.init();_tblInitDelegate();this.render();
|
||||
this._applyLockMode();this._applyLayout();_wikiResolve();
|
||||
this.loadComments();this.loadReactions(); // ancres jaunes + pastilles (v7.64)
|
||||
const tEl=document.getElementById('_titleEl');
|
||||
if(tEl){const syncT=()=>{tEl.classList.toggle('empty',!(tEl.textContent||'').trim());};syncT();tEl.addEventListener('input',syncT);tEl.addEventListener('blur',syncT);}
|
||||
if(this.contentFormat==='blocks'&&window.__fdRT&&window.__fdRT.start){setTimeout(()=>{try{window.__fdRT.start(this);}catch(e){}},150);}
|
||||
@@ -1254,14 +1587,15 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
sync(){const ct=document.getElementById('_blocksCt');if(!ct)return;for(const b of this.blocks){if(b.type==='table'){const wrap=ct.querySelector(`[data-bid="${b.id}"].ftable-editor`);if(wrap){const rows=[];wrap.querySelectorAll('tr.ftable-row').forEach(function(tr){const cells=tr.querySelectorAll('th.ftable-cell,td.ftable-cell');if(!cells.length)return;const rowarr=[];cells.forEach(function(cell){rowarr.push(cell.textContent||'');});rows.push(rowarr);});if(rows.length)b.rows=rows;}continue;}
|
||||
if(b.type==='divider'||b.type==='image'||b.type==='embed'||b.type==='table_of_contents'||b.type==='button')continue;
|
||||
if(b.type==='math'){const te=ct.querySelector(`[data-math-bid="${b.id}"]`);if(te)b.content=te.value||'';continue;}
|
||||
const el=ct.querySelector(`[data-bid="${b.id}"]`);if(el&&!el.classList.contains('toggle-title'))b.content=gtTok(el)||'';else if(el)b.content=gtTok(el)||'';
|
||||
if(b.type==='toggle'&&b.children)b.children.forEach(function(ch){const che=ct.querySelector(`[data-bid="${ch.id}"]`);if(che)ch.content=gtTok(che)||'';});
|
||||
if(b.type==='columns'&&b.children)b.children.forEach(function(ch){const che=ct.querySelector(`[data-bid="${ch.id}"]`);if(che)ch.content=gtTok(che)||'';});
|
||||
const el=ct.querySelector(`[data-bid="${b.id}"]`);if(el&&!el.classList.contains('toggle-title'))b.content=gtMd(el)||'';else if(el)b.content=gtMd(el)||'';
|
||||
if(b.type==='toggle'&&b.children)b.children.forEach(function(ch){const che=ct.querySelector(`[data-bid="${ch.id}"]`);if(che)ch.content=gtMd(che)||'';});
|
||||
if(b.type==='columns'&&b.children)b.children.forEach(function(ch){const che=ct.querySelector(`[data-bid="${ch.id}"]`);if(che)ch.content=gtMd(che)||'';});
|
||||
}},
|
||||
render(){const ct=document.getElementById('_blocksCt');if(!ct)return;let html='';for(let i=0;i<this.blocks.length;i++)html+=renderBlock(this.blocks[i],i);ct.innerHTML=html;
|
||||
// Render math blocks with KaTeX
|
||||
var self=this;
|
||||
ct.querySelectorAll('.math-display').forEach(function(el){var bid=el.dataset.bid;var b=self.blocks.find(function(x){return x.id===bid;});self._renderKatex(el,b?b.content:'');});
|
||||
ct.querySelectorAll('.fd-math-inline').forEach(function(el){var tex=el.getAttribute('data-tex')||'';if(window.katex&&tex){try{el.innerHTML=window.katex.renderToString(tex,{displayMode:false,throwOnError:false});}catch(e){el.textContent=tex;}}else if(tex&&!el.textContent){el.textContent=tex;}});
|
||||
ct.querySelectorAll('.math-editor').forEach(function(ta){var disp=ct.querySelector(`.math-display[data-bid="${ta.dataset.mathBid}"]`);ta.addEventListener('input',function(){self._renderKatex(disp,ta.value);self.dirty=true;self.autoSave();});});
|
||||
// Initialize inline database blocks (scripts in innerHTML don't execute)
|
||||
setTimeout(()=>{ct.querySelectorAll('.block-embed-collection').forEach(el=>{const cid=parseInt(el.id.replace('inline-db-',''));if(cid&&window.FlowDeckDB)window.FlowDeckDB.renderInto(el,cid,null);});},50);
|
||||
@@ -1270,6 +1604,7 @@ const PD=(()=>{try{const el=document.getElementById('page-data');return el?JSON.
|
||||
ct.querySelectorAll('[data-bid]').forEach(el=>{el.addEventListener('input',()=>{self.dirty=true;self.autoSave();if(el.hasAttribute&&el.hasAttribute('data-placeholder'))el.classList.toggle('empty',!(el.textContent||'').trim());if(window.AIAC)window.AIAC.schedule(el.getAttribute('data-bid'));})});
|
||||
ct.querySelectorAll('[data-placeholder]').forEach(el=>{el.innerHTML=el.innerHTML.replace(/<br[^>]*>/gi,'').trim()!==''?el.innerHTML:'';el.classList.toggle('empty',!el.textContent.trim());});
|
||||
_selApply();
|
||||
try{this._paintAnchors();}catch(e){} // ancres jaunes + pastilles (v7.64)
|
||||
var self2=this;
|
||||
setTimeout(function(){
|
||||
if(window._wikiResolve)_wikiResolve();
|
||||
@@ -1523,10 +1858,68 @@ replaceBlock(idx,type){const b=this.blocks[idx];if(!b)return;this.sync();this.pu
|
||||
|
||||
// ── v5.10.0: Turn into / couleurs / liens / déplacement ──
|
||||
_blockTargets(idx){const sel=_selIndicesSorted();return(sel.includes(idx))?sel:[idx];},
|
||||
turnInto(idx,type){if(idx<0||idx>=this.blocks.length)return;if(_BLOCK_TURN_TYPES.indexOf(type)<0)return;const targets=this._blockTargets(idx);const focusId=this.blocks[idx].id;this.sync();this.pushHistory();targets.forEach(i=>{const b=this.blocks[i];if(!b)return;if(b.type===type)return;const keep=(b.content||'').trim();b.type=type;if(type!=='to_do'&&type!=='toggle'&&keep&&['image','embed','meeting','divider','table_of_contents','database','button','columns'].indexOf(b.type)<0){b.content=keep;}else{b.content='';}if(type==='toggle'){b.expanded=true;if(!Array.isArray(b.children))b.children=[];}if(type==='to_do')b.checked=false;if(type==='table'&&!Array.isArray(b.rows))b.rows=_tblNew(3,3);if(type==='code'&&!b.language)b.language='Plain Text';if(type==='columns'&&(!Array.isArray(b.children)||!b.children.length))b.children=[{id:genId(),type:'paragraph',content:''}];if(type==='button'){b.automation_id=0;b.automation_name='';}});
|
||||
turnInto(idx,type,cols){if(idx<0||idx>=this.blocks.length)return;if(!_BLOCK_TURN_TYPES.some(t=>t.id===type))return;const targets=this._blockTargets(idx);const focusId=this.blocks[idx].id;this.sync();this.pushHistory();targets.forEach(i=>{const b=this.blocks[i];if(!b)return;if(b.type===type)return;const keep=(b.content||'').trim();b.type=type;if(keep&&['image','embed','meeting','divider','table_of_contents','database','button','columns'].indexOf(b.type)<0){b.content=keep;}else{b.content='';}if(type==='toggle'){b.expanded=true;if(!Array.isArray(b.children))b.children=[];}if(type==='to_do')b.checked=false;if(type==='table'&&!Array.isArray(b.rows))b.rows=_tblNew(3,3);if(type==='code'&&!b.language)b.language='Plain Text';if(type==='columns'&&(!Array.isArray(b.children)||!b.children.length))b.children=[{id:genId(),type:'paragraph',content:''}];if(type==='columns'&&cols>=2){b.children=Array.from({length:cols},()=>({id:genId(),type:'paragraph',content:''}));}if(type==='synced'){b.synced_id=0;b._synced_content=[];b._synced_title='';}if(type==='button'){b.automation_id=0;b.automation_name='';}});
|
||||
if(type==='synced')setTimeout(()=>this._pickSyncedBlock(idx),80);
|
||||
this.dirty=true;this.autoSave();this.render();_rtSync();_selClear();
|
||||
setTimeout(()=>{const bid=this.blocks[idx]?this.blocks[idx].id:focusId;if(type==='table'){_tblFocus(bid,0,0);}else{const el=this.getEl(bid);if(el){el.focus();ce(el);}}},60);},
|
||||
setBlockColor(idx,key,val){if(idx<0||idx>=this.blocks.length)return;const targets=this._blockTargets(idx);const v=(!val||val==='default')?null:val;this.sync();this.pushHistory();targets.forEach(i=>{const b=this.blocks[i];if(!b)return;if(!b.style)b.style={};if(v==null)delete b.style[key];else b.style[key]=v;});this.dirty=true;this.autoSave();this.render();_rtSync();_selClear();},
|
||||
setBlockColor(idx,key,val){if(idx<0||idx>=this.blocks.length)return;const targets=this._blockTargets(idx);const v=(!val||val==='default')?null:val;this.sync();this.pushHistory();targets.forEach(i=>{const b=this.blocks[i];if(!b)return;if(!b.style)b.style={};if(v==null)delete b.style[key];else b.style[key]=v;});if(v!=null){try{localStorage.setItem('fdLastBlockColor',key+'|'+v);}catch(e){}}this.dirty=true;this.autoSave();this.render();_rtSync();_selClear();},
|
||||
// ── v7.61 : actions du menu contextuel de bloc ──
|
||||
commentBlock(idx){
|
||||
const b=this.blocks[idx];if(!b)return;const el=this.getEl(b.id);if(!el)return;
|
||||
const r=document.createRange();r.selectNodeContents(el);
|
||||
const s=window.getSelection();s.removeAllRanges();s.addRange(r);
|
||||
this.showCommentBtn();
|
||||
if(!this._commentSel||!this._commentSel.range){this.showToast('Sélectionnez du texte pour commenter','error');return;}
|
||||
this.commentOnSelection();
|
||||
},
|
||||
// v7.62 : renommé — « askAI() » (sans argument, plus bas) l'écrasait,
|
||||
// le menu de bloc et Ctrl+J ouvraient l'IA de page au lieu du bloc.
|
||||
askAIBlock(idx){const b=this.blocks[idx];if(!b)return;if(window.AIC)window.AIC.open(idx);},
|
||||
suggestEdit(idx){
|
||||
const b=this.blocks[idx];if(!b||!(b.content||'').trim()){this.showToast('Bloc vide','error');return;}
|
||||
this.showToast('FlowDeck AI : suggestion en cours…');
|
||||
this._aiWritingRun('write',idx,{prompt:'Améliore ce bloc (grammaire, clarté, style) en gardant le sens, la langue et le format. Réponds UNIQUEMENT avec le contenu amélioré, sans préambule.\n\nBloc :\n'+b.content},'insert');
|
||||
},
|
||||
runSkill(idx,tpl){
|
||||
const b=this.blocks[idx];if(!b||!(b.content||'').trim()){this.showToast('Bloc vide','error');return;}
|
||||
this.showToast('FlowDeck AI : compétence en cours…');
|
||||
this._aiWritingRun('write',idx,{prompt:String(tpl||'')+'\n\nContenu du bloc :\n'+b.content},'insert');
|
||||
},
|
||||
// v7.63 : déplacement de bloc depuis la barre mobile
|
||||
// (↑↓ = ordre, → = indent dans le frère précédent, ← = sortir du parent)
|
||||
moveBlock(bid,dir){
|
||||
const top=this.blocks.findIndex(b=>b.id===bid);
|
||||
const pi=this.blocks.findIndex(b=>Array.isArray(b.children)&&b.children.some(c=>c.id===bid));
|
||||
const parent=pi>=0?this.blocks[pi]:null;
|
||||
const list=parent?parent.children:this.blocks;
|
||||
const k=list.findIndex(b=>b.id===bid);
|
||||
if(k<0){this.showToast('Bloc introuvable','error');return;}
|
||||
if(dir==='up'||dir==='down'){
|
||||
const j=dir==='up'?k-1:k+1;
|
||||
if(j<0||j>=list.length){this.showToast(dir==='up'?'Déjà en haut':'Déjà en bas','error');return;}
|
||||
this.sync();this.pushHistory();
|
||||
const mv=list.splice(k,1)[0];list.splice(j,0,mv);
|
||||
}else if(dir==='right'){
|
||||
if(parent){this.showToast('Déjà indenté','error');return;}
|
||||
const prev=this.blocks[top-1];
|
||||
if(!prev||!Array.isArray(prev.children)||(prev.type!=='toggle'&&prev.type!=='columns')){this.showToast('Pas de bloc cible à droite','error');return;}
|
||||
this.sync();this.pushHistory();
|
||||
if(prev.type==='toggle')prev.expanded=true;
|
||||
const mv=this.blocks.splice(top,1)[0];prev.children.push(mv);
|
||||
}else{
|
||||
if(!parent){this.showToast('Déjà à la racine','error');return;}
|
||||
this.sync();this.pushHistory();
|
||||
const mv=parent.children.splice(k,1)[0];
|
||||
this.blocks.splice(pi+1,0,mv);
|
||||
}
|
||||
this.dirty=true;this.autoSave();this.render();_rtSync();this._focusBid(bid);
|
||||
},
|
||||
applyLastColor(idx){
|
||||
let v='';try{v=localStorage.getItem('fdLastBlockColor')||'';}catch(e){}
|
||||
const i=v.indexOf('|');
|
||||
if(i<0){this.showToast('Aucune couleur récente','error');return;}
|
||||
this.setBlockColor(idx,v.slice(0,i),v.slice(i+1));
|
||||
},
|
||||
copyBlockLink(bid){const url=window.location.origin+window.location.pathname+'#fdblk-'+bid;if(navigator.clipboard&&navigator.clipboard.writeText){navigator.clipboard.writeText(url).then(()=>this.showToast('Lien du bloc copié')).catch(()=>this.showToast('Copie impossible','error'));}else{this.showToast(url,'error');}},
|
||||
deleteSelected(idx){const indices=_selIndicesSorted();if(indices.length<=1)return this.removeBlock(idx);this.sync();this.pushHistory();const keep=this.blocks.filter((b,i)=>indices.indexOf(i)<0);this.blocks=keep.length?keep:[this.mkB('paragraph','')];const fi=Math.min(idx,this.blocks.length-1);this.dirty=true;this.autoSave();this.render();_rtSync();_selClear();setTimeout(()=>{const el=this.getEl(this.blocks[fi]?.id);if(el){el.focus();ce(el);}},60);},
|
||||
// ── v5.11: Copy / Cut / Paste selected blocks ──
|
||||
@@ -1996,7 +2389,9 @@ applyAIBlocks(text){
|
||||
if(e.key==='Escape'){e.preventDefault();window.AIAC.clear();return;}
|
||||
if(e.key==='Enter'||e.key==='Backspace'){window.AIAC.clear();}
|
||||
}
|
||||
if(e.key.length===1||e.key==='Backspace'||e.key==='Delete'){const i2=idx;setTimeout(()=>{const e2=this.getEl(this.blocks[i2]?.id);if(e2&&e2.textContent?.trim()==='/'&&!SM.isOpen&&!WM.isOpen)SM.open(i2,e2);
|
||||
if(e.key.length===1||e.key==='Backspace'||e.key==='Delete'){const i2=idx;setTimeout(()=>{const e2=this.getEl(this.blocks[i2]?.id);
|
||||
if(e2&&e2.textContent?.trim()==='/'&&!SM.isOpen&&!WM.isOpen){SM.open(i2,e2);}
|
||||
else if(SM.isOpen){const t=(e2&&e2.textContent)||'';if(t.charAt(0)!=='/')SM.close();}
|
||||
if(e2&&!SM.isOpen&&!WM.isOpen){const t=gtTok(e2)||'';const mm=t.match(/\[\[$/);if(mm){WM.open(i2,e2);}}},15);}
|
||||
if(e.key===' '){
|
||||
if(block.type==='paragraph'&&!(block.content||'').trim()&&!(el.textContent||'').trim()&&!SM.isOpen&&window.AIC){
|
||||
@@ -2023,7 +2418,7 @@ applyAIBlocks(text){
|
||||
if(e.key==='ArrowUp'){const _sp=splitCaret(el);if(_sp&&!_sp.before.trim()&&idx>0){e.preventDefault();const prev=this.getEl(this.blocks[idx-1]?.id);if(prev){prev.focus();ce(prev);}}return;}
|
||||
if(e.key==='ArrowDown'){const _sp=splitCaret(el);if(_sp&&!_sp.after.trim()&&idx<this.blocks.length-1){e.preventDefault();const next=this.getEl(this.blocks[idx+1]?.id);if(next){next.focus();cs(next);}}return;}
|
||||
if(e.key==='Backspace'){if(!(el.textContent||'').trim()){this.sync();if(block.type!=='paragraph'){e.preventDefault();this.pushHistory();block.type='paragraph';block.content='';this.render();_rtSync();setTimeout(()=>{const ne=this.getEl(block.id);if(ne)ne.focus();},60);}else if(this.blocks.length>1){e.preventDefault();this.removeBlock(idx);}}return;}
|
||||
if(e.key===' '){const b2=bid;setTimeout(()=>this.checkMd(b2),15);}
|
||||
if(e.key===' '){const i3=idx;setTimeout(()=>this.checkMd(i3),15);}
|
||||
if((e.ctrlKey||e.metaKey)&&!e.altKey){
|
||||
if(e.key.toLowerCase()==='z'){e.preventDefault();if(e.shiftKey)this.redo();else this.undo();return;}
|
||||
if(e.key.toLowerCase()==='y'){e.preventDefault();this.redo();return;}
|
||||
@@ -2145,12 +2540,83 @@ applyAIBlocks(text){
|
||||
this.render();this.dirty=true;this.autoSave();_rtSync();
|
||||
}catch(e){this.showToast('Failed to load synced blocks','error');}
|
||||
},
|
||||
showFmt(idx){const s=window.getSelection();if(!s.rangeCount||s.isCollapsed){this.fmt.open=false;return;}const r=s.getRangeAt(0).getBoundingClientRect();this.fmt.open=true;this.fmt.idx=idx;this.fmt.top=Math.max(r.top-44,0);this.fmt.left=Math.min(r.left+r.width/2-120,window.innerWidth-260);this._sel={range:s.getRangeAt(0).cloneRange(),idx};},
|
||||
fmtApply(f){this.fmt.open=false;if(!this._sel)return;const s=window.getSelection();s.removeAllRanges();s.addRange(this._sel.range);document.execCommand(f==='strikeThrough'?'strikeThrough':f);this._sel=null;this.dirty=true;this.autoSave();},
|
||||
fmtLink(){this.fmt.open=false;const u=prompt('URL:');if(u){document.execCommand('createLink',false,u);this.dirty=true;this.autoSave();}},
|
||||
// ── v7.62.0 : menu contextuel au highlight de texte (façon Notion) ──
|
||||
showFmt(idx){const s=window.getSelection();if(!s.rangeCount||s.isCollapsed){this.fmt.open=false;this._sel=null;return;}const r=s.getRangeAt(0).getBoundingClientRect();
|
||||
const H=300,W=230;let top=r.bottom+8;if(top+H>window.innerHeight-8)top=Math.max(8,r.top-H);
|
||||
this.fmt.open=true;this.fmt.idx=idx;this.fmt.top=top;
|
||||
this.fmt.left=Math.max(8,Math.min(r.left+r.width/2-W/2,window.innerWidth-W-8));
|
||||
this._sel={range:s.getRangeAt(0).cloneRange(),idx};},
|
||||
_fmtRestore(){const s=window.getSelection();if(this._sel&&this._sel.range){s.removeAllRanges();s.addRange(this._sel.range);}},
|
||||
_fmtBid(){const b=this.blocks[this.fmt.idx];return b?b.id:'';},
|
||||
_fmtSaved(){this.sync();this.dirty=true;this.autoSave();},
|
||||
// style de la 1ʳᵉ ligne : libellé du type de bloc courant
|
||||
fmtStyleName(){const b=this.blocks[this.fmt.idx];const t=b?b.type:'paragraph';
|
||||
const m={paragraph:'Normal Text',heading_1:'Heading 1',heading_2:'Heading 2',heading_3:'Heading 3',heading_4:'Heading 4',
|
||||
bulleted_list:'Bulleted list',numbered_list:'Numbered list',to_do:'To-do list',toggle:'Toggle list',quote:'Quote',
|
||||
callout:'Callout',code:'Code',math:'Block equation',divider:'Divider',table:'Table',image:'Image',embed:'Embed',button:'Button'};
|
||||
return m[t]||'Normal Text';},
|
||||
_fmtSubPos(ev){const r=ev.currentTarget.getBoundingClientRect();
|
||||
return {x:Math.min(r.right+4,window.innerWidth-250),y:Math.min(Math.max(8,r.top),window.innerHeight-140)};},
|
||||
// « Normal Text › » → sous-menu Turn into (menu de bloc existant)
|
||||
fmtStyle(ev){const bid=this._fmtBid();if(!bid)return;const p=this._fmtSubPos(ev);_blockTurnMenuOpen(p.x,p.y,bid);_subHoverClose();},
|
||||
// « A » → sous-menu Color
|
||||
fmtColor(ev){const bid=this._fmtBid();if(!bid)return;const p=this._fmtSubPos(ev);_blockColorMenuOpen(p.x,p.y,bid);_subHoverClose();},
|
||||
// mise en forme de base : le navigateur fait le toggle, sync() persiste (gtMd)
|
||||
fmtApply(f){if(!this._sel)return;const idx=this.fmt.idx;this._fmtRestore();document.execCommand(f);this._fmtSaved();this.showFmt(idx);},
|
||||
fmtCode(){if(!this._sel)return;this._fmtRestore();_selWrapToggle('code');this._fmtSaved();this.fmt.open=false;},
|
||||
fmtHighlight(){if(!this._sel)return;this._fmtRestore();_selWrapToggle('mark');this._fmtSaved();this.fmt.open=false;},
|
||||
fmtCodeBlock(){this.fmt.open=false;const i=this.fmt.idx;if(i>=0)this.turnInto(i,'code');},
|
||||
fmtLink(){if(!this._sel)return;this._fmtRestore();const u=prompt('URL:');if(!u)return;
|
||||
document.execCommand('createLink',false,u);this._fmtSaved();this.fmt.open=false;},
|
||||
fmtEquation(){if(!this._sel)return;this._fmtRestore();const s=window.getSelection();if(!s.rangeCount)return;
|
||||
const tex=prompt('Equation (LaTeX):',s.toString()||'x^2');if(tex===null||!tex.trim())return;
|
||||
const span=document.createElement('span');span.className='fd-math-inline';span.setAttribute('data-tex',tex.trim());
|
||||
if(window.katex){try{span.innerHTML=window.katex.renderToString(tex.trim(),{displayMode:false,throwOnError:false});}catch(e){span.textContent=tex;}}
|
||||
else span.textContent=tex;
|
||||
const r=s.getRangeAt(0);r.deleteContents();r.insertNode(span);
|
||||
this._fmtSaved();this.fmt.open=false;},
|
||||
// « … » → le menu contextuel de bloc (recherche + Text + pied métadonnées)
|
||||
fmtMore(ev){const bid=this._fmtBid();if(!bid)return;const r=ev.currentTarget.getBoundingClientRect();
|
||||
this.fmt.open=false;blockMenuOpen(Math.max(8,Math.min(r.left-190,window.innerWidth-250)),r.bottom+6,bid);},
|
||||
fmtComment(){this.fmt.open=false;const i=this.fmt.idx;if(i>=0)this.commentBlock(i);},
|
||||
fmtAskAI(){this.fmt.open=false;const i=this.fmt.idx;if(i>=0)this.askAIBlock(i);},
|
||||
fmtEditAI(){this.fmtAskAI();},
|
||||
fmtSkill(tpl){this.fmt.open=false;const i=this.fmt.idx;if(i>=0)this.runSkill(i,tpl);},
|
||||
// offsets d'une Range dans le texte rendu d'un bloc (partagé bouton 💬 + réaction)
|
||||
_selSpan(bel,range){return {start:_srcOffset(bel,range.startContainer,range.startOffset),
|
||||
end:_srcOffset(bel,range.endContainer,range.endOffset)};},
|
||||
// « React to selected text » (v7.64) : sélecteur d'émoji avec le texte
|
||||
// sélectionné en en-tête → toggle de la réaction ancrée sur la plage
|
||||
fmtReact(){
|
||||
if(!this._sel)return;
|
||||
const E=this;const bid=this._fmtBid();const bel=this.getEl(bid);
|
||||
if(!bel||!window.FDIconPicker)return;
|
||||
const span=this._selSpan(bel,this._sel.range);
|
||||
if(span.end<=span.start)return;
|
||||
const text=this._sel.range.toString();
|
||||
const r=this._sel.range.getBoundingClientRect();
|
||||
this.fmt.open=false;
|
||||
window.FDIconPicker.openFor({
|
||||
x:Math.min(Math.max(8,r.left-40),window.innerWidth-360),
|
||||
y:Math.min(Math.max(8,r.bottom+8),window.innerHeight-260),
|
||||
title:text.length>90?text.slice(0,90)+'…':text,
|
||||
onPick:function(emoji){E.toggleReaction(bid,span.start,span.end,emoji);}
|
||||
});
|
||||
},
|
||||
// ── v4.9.0: Collaboration — comments & mentions ──
|
||||
toggleComments(){this.commentsOpen=!this.commentsOpen;if(this.commentsOpen)this.loadComments();},
|
||||
async loadComments(){try{const r=await fetch('/api/pages/'+this.pid+'/comments',{credentials:'same-origin'});const d=await r.json();this.comments=d.comments||[];this.commentCount=this.comments.length;}catch(e){this.comments=[];}},
|
||||
async loadComments(){
|
||||
try{const r=await fetch('/api/pages/'+this.pid+'/comments',{credentials:'same-origin'});const d=await r.json();
|
||||
this.comments=d.comments||[];this.commentCount=this.comments.length;}
|
||||
catch(e){this.comments=[];}
|
||||
this._paintAnchors();
|
||||
// #cmt-<id> (copié depuis le menu « … » du fil) → ouvre et centre le fil
|
||||
if(!this._cmtHashDone&&location.hash.indexOf('#cmt-')===0){
|
||||
this._cmtHashDone=true;
|
||||
const cid=parseInt(location.hash.slice(5),10);
|
||||
if(!isNaN(cid))setTimeout(()=>this.openThread(cid),300);
|
||||
}
|
||||
},
|
||||
fmtTime(s){if(!s)return '';const t=new Date((String(s).includes('T')||String(s).includes('Z'))?s:(s+'Z'));if(isNaN(t.getTime()))t=new Date(s);const diff=Math.floor((Date.now()-t.getTime())/1000);if(diff<60)return 'just now';if(diff<3600)return Math.floor(diff/60)+'m ago';if(diff<86400)return Math.floor(diff/3600)+'h ago';return Math.floor(diff/86400)+'d ago';},
|
||||
csrfTok(){return getCsrf();},
|
||||
async addPageComment(){
|
||||
@@ -2165,8 +2631,94 @@ applyAIBlocks(text){
|
||||
else{this.showToast(d.detail||'Failed to add comment');}
|
||||
}catch(e){this.showToast('Failed to add comment');}
|
||||
},
|
||||
async resolveComment(id){try{await fetch('/api/comments/'+id,{method:'PUT',credentials:'same-origin',headers:{'Content-Type':'application/json','X-CSRF-Token':this.csrfTok()},body:JSON.stringify({resolved:true})});await this.loadComments();}catch(e){}},
|
||||
async deleteComment(id){if(!confirm('Delete this comment?'))return;try{await fetch('/api/comments/'+id,{method:'DELETE',credentials:'same-origin',headers:{'X-CSRF-Token':this.csrfTok()}});await this.loadComments();}catch(e){}},
|
||||
async resolveComment(c){
|
||||
// accepte l'objet (le fil → bascule resolve/reopen) ou un id brut
|
||||
let id=c,resolved=true;
|
||||
if(c&&typeof c==='object'){id=c.id;resolved=!c.resolved;}
|
||||
if(!id)return;
|
||||
try{await fetch('/api/comments/'+id,{method:'PUT',credentials:'same-origin',
|
||||
headers:{'Content-Type':'application/json','X-CSRF-Token':this.csrfTok()},
|
||||
body:JSON.stringify({resolved:resolved})});
|
||||
this.commentMenu=null;await this.loadComments();}catch(e){}
|
||||
},
|
||||
async deleteComment(id){if(!confirm('Delete this comment?'))return;try{await fetch('/api/comments/'+id,{method:'DELETE',credentials:'same-origin',headers:{'X-CSRF-Token':this.csrfTok()}});this.commentMenu=null;await this.loadComments();}catch(e){}},
|
||||
// ── v7.64 : réactions emoji sur texte + ancres commentées ──
|
||||
async loadReactions(){
|
||||
try{const r=await fetch('/api/pages/'+this.pid+'/reactions',{credentials:'same-origin'});
|
||||
const d=await r.json();this.reactions=(d&&d.reactions)||[];}catch(e){this.reactions=[];}
|
||||
this._paintAnchors();
|
||||
},
|
||||
async toggleReaction(bid,start,end,emoji){
|
||||
try{
|
||||
const r=await fetch('/api/pages/'+this.pid+'/reactions',{method:'POST',credentials:'same-origin',
|
||||
headers:{'Content-Type':'application/json','X-CSRF-Token':this.csrfTok()},
|
||||
body:JSON.stringify({block_id:bid,anchor_start:start,anchor_end:end,emoji:emoji})});
|
||||
const d=await r.json();
|
||||
if(d.status==='added'||d.status==='removed'){await this.loadReactions();}
|
||||
else this.showToast((d&&d.detail)||'Réaction impossible','error');
|
||||
}catch(e){this.showToast('Réaction impossible','error');}
|
||||
},
|
||||
openThread(cid){
|
||||
this.commentsOpen=true;this.commentMenu=null;
|
||||
const self=this;
|
||||
this.loadComments().then(function(){self.$nextTick(function(){
|
||||
const el=document.querySelector('[data-thread="'+cid+'"]');
|
||||
if(el&&el.scrollIntoView){el.scrollIntoView({block:'center',behavior:'smooth'});
|
||||
el.classList.add('thread-flash');setTimeout(function(){el.classList.remove('thread-flash');},1500);}
|
||||
});});
|
||||
},
|
||||
commentAt(){
|
||||
this.commentDraft=(this.commentDraft||'')+'@';
|
||||
this.$nextTick(function(){const ta=document.querySelector('.comments-drawer textarea');
|
||||
if(ta){ta.focus();ta.selectionStart=ta.selectionEnd=ta.value.length;}});
|
||||
},
|
||||
copyCommentLink(id){
|
||||
const url=location.origin+location.pathname+'#cmt-'+id;
|
||||
this.commentMenu=null;
|
||||
if(navigator.clipboard&&navigator.clipboard.writeText){
|
||||
navigator.clipboard.writeText(url).then(()=>this.showToast('Lien du commentaire copié')).catch(()=>this.showToast(url,'error'));
|
||||
} else this.showToast(url,'error');
|
||||
},
|
||||
// Recalcule les ancres jaunes (commentaires) + pastilles de réaction.
|
||||
// Le texte des blocs est inchangé : sync() lit la même chaîne.
|
||||
_paintAnchors(){
|
||||
const ct=document.getElementById('_blocksCt');if(!ct)return;
|
||||
ct.querySelectorAll('.fd-react-chip').forEach(function(el){el.remove();});
|
||||
ct.querySelectorAll('.fd-anchor').forEach(function(el){
|
||||
const par=el.parentNode;if(!par)return;
|
||||
while(el.firstChild)par.insertBefore(el.firstChild,el);
|
||||
par.removeChild(el);par.normalize();
|
||||
});
|
||||
const self=this;
|
||||
(this.comments||[]).forEach(function(c){
|
||||
if(!c.anchor_block_id||c.anchor_start==null||c.anchor_end==null)return;
|
||||
const el=self.getEl(c.anchor_block_id);if(!el)return;
|
||||
_wrapAnchored(el,parseInt(c.anchor_start,10),parseInt(c.anchor_end,10),
|
||||
'fd-anchor'+(c.resolved?' fd-anchor-done':''),{cid:c.id});
|
||||
});
|
||||
const groups={};
|
||||
(this.reactions||[]).forEach(function(r){
|
||||
const k=r.block_id+':'+r.anchor_start+':'+r.anchor_end;
|
||||
if(!groups[k])groups[k]={bid:r.block_id,start:parseInt(r.anchor_start,10),end:parseInt(r.anchor_end,10),items:[]};
|
||||
groups[k].items.push(r);
|
||||
});
|
||||
Object.keys(groups).forEach(function(k){
|
||||
const g=groups[k];
|
||||
const el=self.getEl(g.bid);if(!el)return;
|
||||
const sp=_wrapAnchored(el,g.start,g.end,'fd-anchor fd-anchor-react',null);
|
||||
if(!sp||!sp.parentNode)return;
|
||||
const n=g.items.reduce(function(a,i){return a+(parseInt(i.count,10)||1);},0);
|
||||
const chip=document.createElement('span');
|
||||
chip.className='fd-react-chip';
|
||||
chip.setAttribute('contenteditable','false');
|
||||
chip.setAttribute('data-react-bid',g.bid);
|
||||
chip.setAttribute('data-react-start',String(g.start));
|
||||
chip.setAttribute('data-react-end',String(g.end));
|
||||
chip.innerHTML=g.items.map(function(i){return '<span class="fd-react-emo">'+_emojiHtml(i.emoji)+'</span>';}).join('')
|
||||
+(n>1?'<span class="fd-react-n">'+n+'</span>':'');
|
||||
sp.parentNode.insertBefore(chip,sp.nextSibling);
|
||||
});
|
||||
},
|
||||
commentOnSelection(){
|
||||
const sel=this._commentSel;if(!sel.range)return;
|
||||
const bid=sel.bid||'';this.commentsOpen=true;this.commentDraft='';
|
||||
@@ -2176,12 +2728,14 @@ applyAIBlocks(text){
|
||||
showCommentBtn(){
|
||||
const s=window.getSelection();if(!s||s.isCollapsed)return;
|
||||
const ct=document.getElementById('_blocksCt');if(!ct||!ct.contains(s.anchorNode))return;
|
||||
const bel=s.anchorNode.parentElement? s.anchorNode.parentElement.closest('[data-bid]'):null;
|
||||
// ancre = nœud texte ou élément (comme showFmt depuis v7.62)
|
||||
const anEl=s.anchorNode?(s.anchorNode.nodeType===1?s.anchorNode:s.anchorNode.parentElement):null;
|
||||
const bel=anEl?anEl.closest('[data-bid]'):null;
|
||||
if(!bel)return;
|
||||
const bid=bel.dataset.bid;
|
||||
const range=s.getRangeAt(0).cloneRange();range.selectNodeContents(bel);range.setEnd(s.getRangeAt(0).startContainer,s.getRangeAt(0).startOffset);
|
||||
const start=range.toString().length;
|
||||
const end=start+s.toString().length;
|
||||
const span0=this._selSpan(bel,s.getRangeAt(0));
|
||||
const start=span0.start;
|
||||
const end=span0.end;
|
||||
if(end<=start)return;
|
||||
this._commentSel={range:s.getRangeAt(0).cloneRange(),bid:bid,start:start,end:end};
|
||||
const r=s.getRangeAt(0).getBoundingClientRect();
|
||||
@@ -2516,11 +3070,53 @@ applyAIBlocks(text){
|
||||
}return bl;},
|
||||
};
|
||||
}
|
||||
document.addEventListener('mouseup',()=>{setTimeout(()=>{const s=window.getSelection();if(!s||s.isCollapsed)return;const ed=document.querySelector('.page-editor-wrapper');if(!ed?.__x)return;const d=ed.__x.$data;const ct=document.getElementById('_blocksCt');if(!ct?.contains(s.anchorNode))return;const bel=s.anchorNode.parentElement?.closest('[data-bid]');if(bel){const idx=d.getIdx(bel.dataset.bid);if(idx>=0)d.showFmt(idx);d.showCommentBtn();}else{d.hideCommentBtn();}},80);});
|
||||
document.addEventListener('mousedown',()=>{setTimeout(()=>{const ed=document.querySelector('.page-editor-wrapper');if(ed?.__x)ed.__x.$data.hideCommentBtn();},10);});
|
||||
// v7.62 : data Alpine du wrapper éditeur — Alpine v3 n'expose plus __x
|
||||
// (l'ancien accès rendait muets showFmt/hideCommentBtn/mentions).
|
||||
function _xed(el){ if(!el) return null; if(el.__x&&el.__x.$data) return el.__x.$data;
|
||||
return (el._x_dataStack&&el._x_dataStack[0])||null; }
|
||||
// v7.64 : clic sur une ancre jaune → ouvre et centre le fil de discussion ;
|
||||
// clic sur une pastille de réaction → réouvre le sélecteur pour cette plage.
|
||||
document.addEventListener('click',function(ev){
|
||||
const t=ev.target;if(!t||!t.closest)return;
|
||||
const d=_xed(document.querySelector('.page-editor-wrapper'));if(!d)return;
|
||||
const chip=t.closest('.fd-react-chip');
|
||||
if(chip){
|
||||
const bid=chip.getAttribute('data-react-bid');
|
||||
const start=parseInt(chip.getAttribute('data-react-start'),10);
|
||||
const end=parseInt(chip.getAttribute('data-react-end'),10);
|
||||
const el=d.getEl(bid);const rect=chip.getBoundingClientRect();
|
||||
if(!window.FDIconPicker||!el||isNaN(start)||isNaN(end))return;
|
||||
window.FDIconPicker.openFor({
|
||||
x:Math.min(Math.max(8,rect.left-40),window.innerWidth-360),
|
||||
y:Math.min(Math.max(8,rect.bottom+8),window.innerHeight-260),
|
||||
title:(el.textContent||'').slice(start,end),
|
||||
onPick:function(emoji){d.toggleReaction(bid,start,end,emoji);}
|
||||
});
|
||||
return;
|
||||
}
|
||||
const anch=t.closest('.fd-anchor[data-cid]');
|
||||
if(anch&&d.openThread){
|
||||
const cid=parseInt(anch.getAttribute('data-cid'),10);
|
||||
if(!isNaN(cid))d.openThread(cid);
|
||||
}
|
||||
});
|
||||
document.addEventListener('mouseup',(ev)=>{setTimeout(()=>{
|
||||
// v7.62 : clic dans la toolbar → on laisse la sélection (et le menu) intacts ;
|
||||
// sélection relâchée/cliquée ailleurs → le menu de sélection se ferme.
|
||||
if(ev.target&&ev.target.closest&&ev.target.closest('.format-toolbar'))return;
|
||||
const d=_xed(document.querySelector('.page-editor-wrapper'));if(!d)return;
|
||||
const s=window.getSelection();
|
||||
if(!s||s.isCollapsed){d.fmt.open=false;d._sel=null;return;}
|
||||
const ct=document.getElementById('_blocksCt');
|
||||
if(!ct?.contains(s.anchorNode)){d.fmt.open=false;d._sel=null;return;}
|
||||
const bel0=s.anchorNode&&(s.anchorNode.nodeType===1?s.anchorNode:s.anchorNode.parentElement);
|
||||
const bel=bel0?bel0.closest('[data-bid]'):null;
|
||||
if(bel){const idx=d.getIdx(bel.dataset.bid);if(idx>=0)d.showFmt(idx);d.showCommentBtn();}else{d.hideCommentBtn();}
|
||||
},80);});
|
||||
document.addEventListener('mousedown',()=>{setTimeout(()=>{const d=_xed(document.querySelector('.page-editor-wrapper'));if(d)d.hideCommentBtn();},10);});
|
||||
document.addEventListener('keyup',(e)=>{
|
||||
const ed=document.querySelector('.page-editor-wrapper');if(!ed?.__x)return;
|
||||
const d=ed.__x.$data;if(!d.mentionOpen){if(e.key!=='@')return;}
|
||||
const d=_xed(document.querySelector('.page-editor-wrapper'));if(!d)return;
|
||||
if(!d.mentionOpen){if(e.key!=='@')return;}
|
||||
const el=document.activeElement;if(!el||!el.hasAttribute('data-bid'))return;
|
||||
const ct=document.getElementById('_blocksCt');if(!ct||!ct.contains(el))return;
|
||||
if(d.mentionOpen){
|
||||
@@ -2531,8 +3127,8 @@ applyAIBlocks(text){
|
||||
d.openMention(el);
|
||||
},true);
|
||||
document.addEventListener('click',(e)=>{
|
||||
const ed=document.querySelector('.page-editor-wrapper');if(!ed?.__x)return;
|
||||
const d=ed.__x.$data;if(!d.mentionOpen)return;
|
||||
const d=_xed(document.querySelector('.page-editor-wrapper'));if(!d)return;
|
||||
if(!d.mentionOpen)return;
|
||||
const menu=document.getElementById('_mentionMenu');
|
||||
if(menu&&!menu.contains(e.target))d.closeMention();
|
||||
});
|
||||
@@ -2580,6 +3176,44 @@ applyAIBlocks(text){
|
||||
// `window.E` survit aux navigations partielles : on exige donc que
|
||||
// l'editeur soit reellement monte (`#_blocksCt`) avant d'agir, sinon
|
||||
// Ctrl+S sauvegarderait un editeur detache depuis une autre page.
|
||||
// ── v7.61 : raccourcis du menu contextuel de bloc ──
|
||||
document.addEventListener('keydown', function (e) {
|
||||
var E = window.E;
|
||||
if (!E || !document.getElementById('_blocksCt')) return;
|
||||
var k = String(e.key || '').toLowerCase();
|
||||
var ctrl = e.ctrlKey || e.metaKey, sh = e.shiftKey, alt = e.altKey;
|
||||
var menu = document.getElementById('blockMenu');
|
||||
var menuBid = menu ? (menu.getAttribute('data-bid') || '') : '';
|
||||
function curIdx(){
|
||||
if (menuBid) { var mi = E.getIdx(menuBid); if (mi >= 0) return mi; }
|
||||
var ab = E.getActiveBlock();
|
||||
return ab && ab.idx >= 0 ? ab.idx : -1;
|
||||
}
|
||||
if (ctrl && !sh && !alt && k === 'j') { e.preventDefault(); var i1 = curIdx(); if (i1 >= 0) E.askAIBlock(i1); return; }
|
||||
if (ctrl && sh && !alt && k === 'h') { e.preventDefault(); var i2 = curIdx(); if (i2 >= 0) E.applyLastColor(i2); return; }
|
||||
if (ctrl && sh && !alt && k === 'm') { e.preventDefault(); var i3 = curIdx(); if (i3 >= 0) E.commentBlock(i3); return; }
|
||||
if (ctrl && sh && alt && k === 'x') { e.preventDefault(); var i4 = curIdx(); if (i4 >= 0) E.suggestEdit(i4); return; }
|
||||
if (alt && sh && !ctrl && k === 'l') { e.preventDefault(); var i5 = curIdx(); if (i5 >= 0) E.copyBlockLink(E.blocks[i5].id); return; }
|
||||
if (alt && sh && !ctrl && k === 'e') { e.preventDefault(); var i7 = curIdx(); if (i7 >= 0) E.askAIBlock(i7); return; }
|
||||
if (ctrl && sh && !alt && k === 'p') { e.preventDefault(); var i6 = curIdx(); if (i6 >= 0) _blockMoveToOpen(i6); return; }
|
||||
// Ctrl+D : déjà géré par la saisie quand le bloc a le focus (pas de doublon)
|
||||
if (ctrl && !sh && !alt && k === 'd') {
|
||||
var ab = E.getActiveBlock();
|
||||
if (ab && document.activeElement === ab.el) return;
|
||||
var idc = ab && ab.idx >= 0 ? ab.idx : (menuBid ? E.getIdx(menuBid) : -1);
|
||||
if (idc >= 0) { e.preventDefault(); E.duplicateBlock(idc); }
|
||||
return;
|
||||
}
|
||||
// Del : supprime le bloc SEULEMENT avec le menu ouvert (jamais pendant la saisie)
|
||||
if (k === 'delete' && !ctrl && !sh && !alt && menu) {
|
||||
var tgt = e.target;
|
||||
if (tgt && (tgt.tagName === 'INPUT' || tgt.tagName === 'TEXTAREA' || tgt.isContentEditable)) return;
|
||||
var i8 = curIdx();
|
||||
if (i8 >= 0) { e.preventDefault(); E.deleteSelected(i8); }
|
||||
return;
|
||||
}
|
||||
if (k === 'escape' && menu) { _blockMenuClose(); return; }
|
||||
});
|
||||
document.addEventListener('keydown', function (e) {
|
||||
if (!(e.ctrlKey || e.metaKey) || e.altKey || e.shiftKey) return;
|
||||
if (String(e.key).toLowerCase() !== 's') return;
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
"""7.59.3 — « Turn into » du menu contextuel : garde cassée + texte conservé."""
|
||||
|
||||
import json
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
EDITOR_JS = ROOT / "static" / "js" / "page_editor_scripts.js"
|
||||
SRC = EDITOR_JS.read_text(encoding="utf-8")
|
||||
|
||||
|
||||
def _slice(start: str, end: str) -> str:
|
||||
i = SRC.index(start)
|
||||
j = SRC.index(end, i)
|
||||
return SRC[i:j].rstrip()
|
||||
|
||||
|
||||
def test_turn_into_guard_matches_objects_not_strings():
|
||||
# BUG : indexOf() sur un tableau d'objets → toujours -1 → retour immédiat.
|
||||
assert "_BLOCK_TURN_TYPES.indexOf(type)" not in SRC
|
||||
assert "_BLOCK_TURN_TYPES.some(t=>t.id===type)" in SRC
|
||||
|
||||
|
||||
def test_turn_into_menu_wiring():
|
||||
# menu ⋮⋮ → « Turn into » → sous-menu → choix de type
|
||||
assert "_blockMenuItem('submenu','↩','Turn into',{sub:'turn'})" in SRC
|
||||
assert "'turn-type'" in SRC # construit par _blockMenuItem
|
||||
assert "act==='turn-type'" in SRC
|
||||
assert "_blockTurnMenuOpen(" in SRC
|
||||
|
||||
|
||||
def test_turn_into_keeps_text_for_to_do_and_toggle():
|
||||
# Convertir un texte en To-do / Toggle ne doit plus effacer le contenu.
|
||||
line = [ln for ln in SRC.splitlines()
|
||||
if ln.strip().startswith("turnInto(idx,type")][0]
|
||||
assert "type!=='to_do'&&type!=='toggle'" not in line
|
||||
assert "if(keep&&['image','embed','meeting','divider'" in line
|
||||
|
||||
|
||||
# ── Comportement réel : la méthode extraite de la source, exécutée sous node ─
|
||||
|
||||
def test_turn_into_converts_blocks_for_real():
|
||||
node = shutil.which("node")
|
||||
if not node:
|
||||
pytest.skip("node absent : test comportemental turnInto ignoré")
|
||||
types = _slice("const _BLOCK_TURN_TYPES=[", "];")
|
||||
method = _slice("turnInto(idx,type", "setBlockColor(idx,key,val){")
|
||||
script = f"""
|
||||
function _rtSync(){{}}
|
||||
function _selClear(){{}}
|
||||
{types}];
|
||||
const E = {{
|
||||
blocks: [{{id:'b1',type:'paragraph',content:'Bonjour'}}],
|
||||
_blockTargets(i){{return [i];}},
|
||||
sync(){{}}, pushHistory(){{}}, dirty:false,
|
||||
autoSave(){{}}, render(){{}}, getEl(){{return null;}},
|
||||
{method}
|
||||
}};
|
||||
E.turnInto(0,'heading_2');
|
||||
const heading = {{type:E.blocks[0].type, content:E.blocks[0].content}};
|
||||
E.turnInto(0,'to_do');
|
||||
const to_do = {{type:E.blocks[0].type, content:E.blocks[0].content, checked:E.blocks[0].checked}};
|
||||
E.turnInto(0,'button'); // type sans texte → contenu vidé
|
||||
const button = {{type:E.blocks[0].type, content:E.blocks[0].content}};
|
||||
console.log(JSON.stringify({{heading:heading, to_do:to_do, button:button}}));
|
||||
"""
|
||||
out = subprocess.run([node, "-e", script], capture_output=True, text=True,
|
||||
timeout=30, encoding="utf-8")
|
||||
assert out.returncode == 0, out.stderr
|
||||
res = json.loads(out.stdout)
|
||||
|
||||
# 1) le changement de format a lieu (avant la correction : aucune conversion)
|
||||
assert res["heading"] == {"type": "heading_2", "content": "Bonjour"}
|
||||
|
||||
# 2) To-do : texte conservé comme étiquette, case décochée
|
||||
assert res["to_do"] == {"type": "to_do", "content": "Bonjour", "checked": False}
|
||||
|
||||
# 3) Button (type sans texte) → contenu vidé
|
||||
assert res["button"] == {"type": "button", "content": ""}
|
||||
@@ -0,0 +1,29 @@
|
||||
"""7.60.0 — bouton + à gauche du handle : ajoute un bloc sous le courant."""
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
EDITOR_JS = (ROOT / "static" / "js" / "page_editor_scripts.js").read_text(encoding="utf-8")
|
||||
APP_CSS = (ROOT / "static" / "css" / "app.css").read_text(encoding="utf-8")
|
||||
|
||||
|
||||
def test_button_rendered_left_of_the_handle():
|
||||
# le + est émis AVANT le handle dans le wrapper du bloc
|
||||
i_btn = EDITOR_JS.index("class=\"block-insert-btn\"")
|
||||
i_handle = EDITOR_JS.index("<div class=\"block-handle\">", i_btn)
|
||||
assert i_btn < i_handle
|
||||
# clic → insertion sous le bloc courant (mécanisme déjà existant)
|
||||
assert 'class="block-insert-btn" title="Add block below" aria-label="Add block below" onclick="E.addAfter(${idx})"' in EDITOR_JS
|
||||
# réservé aux blocs de premier niveau (idx valide), comme .block-actions
|
||||
assert "const insertBtn=idx>=0?" in EDITOR_JS
|
||||
assert "addAfter(idx,type){return this.addAt(idx+1,type);}" in EDITOR_JS
|
||||
|
||||
|
||||
def test_button_style_and_visibility():
|
||||
assert ".block-insert-btn {" in APP_CSS
|
||||
assert "left: -64px;" in APP_CSS # gouttière .blocks-container (64px)
|
||||
assert ".block-wrapper:hover .block-insert-btn," in APP_CSS
|
||||
assert ".block-insert-btn:hover {" in APP_CSS
|
||||
# suit le handle quand la gouttière passe à 32px, masqué partout où il l'est
|
||||
assert ".block-insert-btn { left: -56px; }" in APP_CSS
|
||||
assert APP_CSS.count(".block-insert-btn { display: none; }") == 2
|
||||
@@ -0,0 +1,172 @@
|
||||
"""7.61.0 — menu contextuel de bloc refondu façon Notion (actions + raccourcis)."""
|
||||
|
||||
import json
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
SRC = (ROOT / "static" / "js" / "page_editor_scripts.js").read_text(encoding="utf-8")
|
||||
CSS = (ROOT / "static" / "css" / "app.css").read_text(encoding="utf-8")
|
||||
|
||||
|
||||
def _slice(start: str, end: str) -> str:
|
||||
i = SRC.index(start)
|
||||
j = SRC.index(end, i)
|
||||
return SRC[i:j].rstrip()
|
||||
|
||||
|
||||
# ── Panneau de gauche ───────────────────────────────────────────────────────
|
||||
|
||||
def test_left_panel_matches_spec():
|
||||
# recherche, groupe « Text », les 10 actions dans l'ordre, pied métadonnées
|
||||
assert 'placeholder="Search actions..."' in SRC
|
||||
assert "'<div class=\"bm-group\">Text</div>'" in SRC
|
||||
order = ["'↩','Turn into'", "'🎨','Color'", "'🔗','Copy link to block'",
|
||||
"'▣','Duplicate'", "'↪','Move to…'", "'✕','Delete'",
|
||||
"'💬','Comment'", "'✎','Suggest edits'", "'✨','Ask AI'",
|
||||
"'📚','Skills'"]
|
||||
chunk = SRC[src_index("d.innerHTML='<input"):src_index("+_blockMenuMeta(b);")]
|
||||
positions = [chunk.index(o) for o in order]
|
||||
assert positions == sorted(positions), positions
|
||||
# pied de page : auteur / heure / taille
|
||||
meta = _slice("function _blockMenuMeta(", "\n function blockMenuOpen(")
|
||||
for token in ("Last edited by ", "word", "character", "Today at ",
|
||||
".um-name", "updatedAt"):
|
||||
assert token in meta, token
|
||||
|
||||
|
||||
def src_index(needle: str) -> int:
|
||||
return SRC.index(needle)
|
||||
|
||||
|
||||
def test_actions_are_all_dispatched():
|
||||
dispatch = _slice("function _blockMenuClick(", "\n function _blockMenuItem(")
|
||||
for act in ("submenu", "duplicate", "copy-link", "move-to", "delete",
|
||||
"comment", "suggest", "ai", "skill", "color", "turn-type"):
|
||||
assert f"act==='{act}'" in dispatch, act
|
||||
# méthodes réelles côté éditeur
|
||||
# v7.62 : « askAI(idx) » renommé askAIBlock(idx) — « askAI() » l'écrasait
|
||||
for m in ("commentBlock(idx)", "askAIBlock(idx)", "suggestEdit(idx)",
|
||||
"runSkill(idx,tpl)", "applyLastColor(idx)",
|
||||
"copyBlockLink(bid)", "deleteSelected(idx)", "duplicateBlock("):
|
||||
assert m in SRC, m
|
||||
# menu : pas d'entrée « copier/couper/coller les blocs » (raccourcis conservés)
|
||||
assert "act==='copy-blocks'" not in dispatch
|
||||
|
||||
|
||||
# ── Sous-menus ──────────────────────────────────────────────────────────────
|
||||
|
||||
def test_turn_into_submenu():
|
||||
# v7.63 : le générateur d'items a été extrait (_blockTurnItems) pour être
|
||||
# réutilisé par la feuille mobile — le test vise le générateur.
|
||||
turn = _slice("function _blockTurnItems(", "\n function _blockColorItems(")
|
||||
assert "_BLOCK_TURN_MENU" in turn and "check:on" in turn # ✓ du type actuel
|
||||
assert "'<span class=\"bm-check\">✓</span>'" in SRC
|
||||
for name in ("Text", "Heading 1", "Heading 4", "Bulleted list",
|
||||
"Numbered list", "To-do list", "Toggle list", "Code", "Quote",
|
||||
"Callout", "Block equation", "Synced block",
|
||||
"2 columns", "5 columns"):
|
||||
assert f"'{name}'" in SRC, name
|
||||
assert "Create '+t.cols+' columns of blocks" in SRC # info-bulle
|
||||
assert "data-cols" in SRC and "cols>=2" in SRC # 2..5 colonnes
|
||||
# Page / Page in / Toggle heading : types inexistants dans FlowDeck → absents
|
||||
assert "'Page in'" not in SRC and "'Toggle heading 1'" not in SRC
|
||||
|
||||
|
||||
def test_color_submenu():
|
||||
color = _slice("function _blockColorItems(", "\n function _blockSkillsMenuOpen(")
|
||||
for group in ("Last used", "Text color", "Background color"):
|
||||
assert f">{group}</div>" in color, group
|
||||
names = ["'Default'", "'Gray'", "'Brown'", "'Orange'", "'Yellow'",
|
||||
"'Green'", "'Blue'", "'Purple'", "'Pink'", "'Red'"]
|
||||
arr = _slice("const _BLOCK_COLOR_NAMES=", "];")
|
||||
for n in names:
|
||||
assert n in arr, n
|
||||
assert "bm-dot" in color # carré de couleur (fond)
|
||||
assert "_BM_SHORTCUTS.color" in color # raccourci « Last used »
|
||||
assert "fdLastBlockColor" in SRC # mémoire de la dernière couleur
|
||||
|
||||
|
||||
def test_skills_submenu_uses_real_skills():
|
||||
skills = _slice("function _blockSkillsMenuOpen(", "\n function _rtMac(")
|
||||
assert "fetch('/api/agent/skills'" in skills
|
||||
assert "act==='skill'" in SRC or "'skill'" in skills
|
||||
assert "prompt_template" in skills
|
||||
assert "_aiWritingRun('write',idx" in SRC # exécution réelle via l'IA
|
||||
|
||||
|
||||
# ── Survol / fermeture ──────────────────────────────────────────────────────
|
||||
|
||||
def test_hover_submenus_and_close():
|
||||
for token in ("_blockSubOpen(kind,bid,anchor)", "data-sub",
|
||||
"closest('[data-sub]')", "mouseleave", "_blockSubCloseLater",
|
||||
"function _blockMenuClose()", "_blockDocDown"):
|
||||
assert token in SRC, token
|
||||
assert "si.focus()" in SRC # recherche focalisée à l'ouverture
|
||||
|
||||
|
||||
# ── Raccourcis ──────────────────────────────────────────────────────────────
|
||||
|
||||
def test_shortcuts_implemented():
|
||||
keys = _slice("// ── v7.61 : raccourcis du menu contextuel de bloc ──",
|
||||
"document.addEventListener('keydown', function (e) {\n if (!(e.ctrlKey || e.metaKey)")
|
||||
combos = {
|
||||
"k === 'j'": "Ctrl+J (Ask AI)",
|
||||
"k === 'h'": "Ctrl+⇧+H (dernière couleur)",
|
||||
"k === 'm'": "Ctrl+⇧+M (commenter)",
|
||||
"k === 'x'": "Ctrl+⇧+Alt+X (suggest edits)",
|
||||
"k === 'l'": "Alt+⇧+L (copier le lien)",
|
||||
"k === 'p'": "Ctrl+⇧+P (déplacer vers…)",
|
||||
"k === 'd'": "Ctrl+D (dupliquer)",
|
||||
"k === 'delete'": "Del (supprimer, menu ouvert uniquement)",
|
||||
"k === 'escape'": "Échap (fermer)",
|
||||
}
|
||||
for token, label in combos.items():
|
||||
assert token in keys, label
|
||||
# Del n'agit jamais pendant la saisie
|
||||
assert "tgt.isContentEditable" in keys
|
||||
# le libellé affiché dans le menu correspond aux combinaisons réelles
|
||||
shortcuts = _slice("const _BM_SHORTCUTS=", ";")
|
||||
for hint in ("Alt+⇧+L", "Ctrl+D", "Ctrl+⇧+P", "Del", "Ctrl+⇧+M",
|
||||
"Ctrl+⇧+Alt+X", "Ctrl+J", "Ctrl+⇧+H"):
|
||||
assert hint in shortcuts, hint
|
||||
|
||||
|
||||
# ── Comportement réel : conversion en colonnes (node) ───────────────────────
|
||||
|
||||
def test_turn_into_columns_creates_children_for_real():
|
||||
node = shutil.which("node")
|
||||
if not node:
|
||||
pytest.skip("node absent : test comportemental ignoré")
|
||||
types = _slice("const _BLOCK_TURN_TYPES=[", "];")
|
||||
method = _slice("turnInto(idx,type", "setBlockColor(idx,key,val){")
|
||||
script = f"""
|
||||
function _rtSync(){{}}
|
||||
function _selClear(){{}}
|
||||
var _n=0; function genId(){{return 'g'+(++_n);}}
|
||||
{types}];
|
||||
const E = {{
|
||||
blocks:[{{id:'b1',type:'paragraph',content:'Titre'}}],
|
||||
_blockTargets(i){{return [i];}}, sync(){{}}, pushHistory(){{}}, dirty:false,
|
||||
autoSave(){{}}, render(){{}}, getEl(){{return null;}}, _pickSyncedBlock(){{}},
|
||||
{method}
|
||||
}};
|
||||
E.turnInto(0,'columns',3);
|
||||
console.log(JSON.stringify({{type:E.blocks[0].type, kids:E.blocks[0].children.length}}));
|
||||
"""
|
||||
out = subprocess.run([node, "-e", script], capture_output=True, text=True,
|
||||
timeout=30, encoding="utf-8")
|
||||
assert out.returncode == 0, out.stderr
|
||||
assert json.loads(out.stdout) == {"type": "columns", "kids": 3}
|
||||
|
||||
|
||||
# ── Styles ──────────────────────────────────────────────────────────────────
|
||||
|
||||
def test_menu_styles():
|
||||
for sel in (".block-menu .bm-group {", ".block-menu .bm-foot {",
|
||||
".block-menu .bm-check {", ".block-menu .bm-dot {",
|
||||
".block-menu-sub { min-width: 230px; max-height: 60vh;"):
|
||||
assert sel in CSS, sel
|
||||
@@ -0,0 +1,155 @@
|
||||
"""7.62.0 — menu contextuel au highlight de texte (toolbar façon Notion)."""
|
||||
|
||||
import json
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
SRC = (ROOT / "static" / "js" / "page_editor_scripts.js").read_text(encoding="utf-8")
|
||||
TPL = (ROOT / "app" / "templates" / "_page_editor_content.html").read_text(encoding="utf-8")
|
||||
CSS = (ROOT / "static" / "css" / "app.css").read_text(encoding="utf-8")
|
||||
APPJS = (ROOT / "static" / "js" / "app.js").read_text(encoding="utf-8")
|
||||
|
||||
|
||||
def _slice(src: str, start: str, end: str) -> str:
|
||||
i = src.index(start)
|
||||
return src[i:src.index(end, i)]
|
||||
|
||||
|
||||
# ── Markup : les 4 lignes + Skills + pied, dans l'ordre de la description ───
|
||||
|
||||
def test_toolbar_markup_matches_spec():
|
||||
chunk = _slice(TPL, 'class="format-toolbar"', "Copy Link Toast")
|
||||
order = [
|
||||
"fmtStyle($event)", # ligne 1 : Normal Text ›
|
||||
"fmtApply('bold')", "fmtApply('italic')", "fmtApply('underline')",
|
||||
"fmtApply('strikeThrough')", "fmtCode()", # ligne 2 : A B I U T Tx
|
||||
"fmtLink()", "fmtHighlight()", "fmtCodeBlock()", "fmtEquation()",
|
||||
"fmtMore($event)", # ligne 3 : 🔗 S </> √x …
|
||||
"fmtComment()", "fmtAskAI()", # ligne 4 : 💬 ✨
|
||||
"ft-group", "Improve writing", "Proofread", "Explain", "Reformat",
|
||||
"Edit with AI", "Alt+⇧+E", # pied de page
|
||||
]
|
||||
positions = [chunk.index(o) for o in order]
|
||||
assert positions == sorted(positions), positions
|
||||
# ligne 1 dynamique (type du bloc) + chevron de sous-menu
|
||||
assert "fmtStyleName()" in chunk and "ft-caret" in chunk
|
||||
# info-bulle HTML (exemple en italique + description)
|
||||
assert "data-tooltip-html=" in chunk
|
||||
# icônes réellement définies dans le jeu d'icônes
|
||||
assert 'fd_icon("message-square",15)' in chunk
|
||||
assert 'fd_icon("sparkles",15)' in chunk and 'fd_icon("link",15)' in chunk
|
||||
|
||||
|
||||
# ── Actions : câblées vers de vraies méthodes, sous-menus réutilisés ────────
|
||||
|
||||
def test_actions_are_wired_to_real_methods():
|
||||
for m in ("fmtStyle(ev)", "fmtColor(ev)", "fmtApply(f)", "fmtCode()",
|
||||
"fmtHighlight()", "fmtCodeBlock()", "fmtLink()", "fmtEquation()",
|
||||
"fmtMore(ev)", "fmtComment()", "fmtAskAI()", "fmtSkill(tpl)",
|
||||
"fmtEditAI()", "askAIBlock(idx)"):
|
||||
assert m in SRC, m
|
||||
# pas de doublon de menu : on rouvre les sous-menus/menus déjà existants
|
||||
assert "_blockTurnMenuOpen(p.x,p.y,bid)" in SRC
|
||||
assert "_blockColorMenuOpen(p.x,p.y,bid)" in SRC
|
||||
assert "blockMenuOpen(" in SRC
|
||||
# sous-menu ouvert depuis la toolbar : fermeture au survol sortant
|
||||
assert "function _subHoverClose()" in SRC
|
||||
# Ctrl+J et Alt+⇧+E ouvrent l'IA du BLOC (l'ancien askAI(idx) était écrasé
|
||||
# par askAI() défini plus bas dans le même objet)
|
||||
assert "E.askAIBlock(i1)" in SRC
|
||||
assert "k === 'e'" in SRC
|
||||
assert "askAI(idx)" not in SRC
|
||||
|
||||
|
||||
# ── Persistance du formatage : sync() relit le DOM formaté en markdown ─────
|
||||
|
||||
def test_formatting_survives_sync():
|
||||
assert "function gtMd(" in SRC
|
||||
assert "gtMd(el)" in SRC and "gtMd(che)" in SRC # sync() + enfants toggle/columns
|
||||
for tok in ("'**'+inner+'**'", "'*'+inner+'*'", "'__'+inner+'__'",
|
||||
"'~~'+inner+'~~'", "'`'+inner+'`'", "'=='+inner+'=='"):
|
||||
assert tok in SRC, tok
|
||||
# mdEsc rend les nouveaux marqueurs (souligné, surlignage, équation inline)
|
||||
for re_ in ("/__([^_]+)__/g", "/==([^=]+)==/g", "/\\$\\$([^$]+)\\$\\$/g"):
|
||||
assert re_ in SRC, re_
|
||||
# les chips wiki gardent leur token brut
|
||||
assert "fd-wiki-chip" in SRC
|
||||
|
||||
|
||||
# ── Placement & fermeture ──────────────────────────────────────────────────
|
||||
|
||||
def test_menu_position_and_close():
|
||||
assert "r.bottom+8" in SRC # sous la sélection (bas de l'écran : au-dessus)
|
||||
assert "d.fmt.open=false;d._sel=null" in SRC # clic ailleurs → fermeture
|
||||
assert "closest('.format-toolbar')" in SRC # clic dans la toolbar ≠ clic ailleurs
|
||||
assert "@mousedown.prevent" in TPL # la sélection survit au clic
|
||||
|
||||
|
||||
# ── Styles ────────────────────────────────────────────────────────────────
|
||||
|
||||
def test_menu_styles():
|
||||
for sel in (".format-toolbar .ft-row {", ".format-toolbar .ft-item {",
|
||||
".format-toolbar .ft-style {", ".format-toolbar .ft-group {",
|
||||
".format-toolbar .ft-sep {", ".format-toolbar .ft-foot {",
|
||||
".tooltip.tooltip-light {"):
|
||||
assert sel in CSS, sel
|
||||
# l'info-bulle claire s'applique aux éléments du menu de sélection
|
||||
assert "data-tooltip-html" in APPJS and "tooltip-light" in APPJS
|
||||
|
||||
|
||||
# ── Comportement réel : gtMd (DOM → source markdown) + mdEsc, sous node ────
|
||||
|
||||
def test_gt_md_and_md_esc_roundtrip_for_real():
|
||||
node = shutil.which("node")
|
||||
if not node:
|
||||
pytest.skip("node absent : test comportemental ignoré")
|
||||
gtmd = _slice(SRC, "function gtMd(", " // Enveloppe/désenveloppe")
|
||||
mdesc = _slice(SRC, "function mdEsc(", " // v5.11.0: labels of [[fdpage:ID]]")
|
||||
script = f"""
|
||||
var window = {{}}; // gtMd fait window.gtMd=…
|
||||
function gtTok(e){{ return e.__raw || ''; }}
|
||||
function fdDateLabel(iso){{ return iso; }}
|
||||
{gtmd}
|
||||
{mdesc}
|
||||
// DOM minimal (gtMd ne lit que childNodes / tagName / classList / attributs)
|
||||
function T(s){{ return {{nodeType:3, nodeValue:s}}; }}
|
||||
function E(tag, attrs, kids){{
|
||||
attrs = attrs || {{}};
|
||||
const cls = String(attrs['class'] || '').split(/\\s+/);
|
||||
return {{nodeType:1, tagName:tag, childNodes:kids || [],
|
||||
classList:{{contains:c=>cls.indexOf(c) >= 0}},
|
||||
getAttribute:k=>(k in attrs ? attrs[k] : null),
|
||||
hasAttribute:k=>(k in attrs)}};
|
||||
}}
|
||||
// querySelector truthy → chemin « formaté » de gtMd (gtTok jamais appelé)
|
||||
const root = E('DIV', {{'class':''}}, [
|
||||
E('B', {{}}, [T('gras')]),
|
||||
E('EM', {{}}, [T('italique')]),
|
||||
E('U', {{}}, [T('souligne')]),
|
||||
E('S', {{}}, [T('barre')]),
|
||||
E('CODE', {{}}, [T('code')]),
|
||||
E('MARK', {{}}, [T('surligne')]),
|
||||
E('A', {{'href':'https://example.com/x'}}, [T('lien')]),
|
||||
E('SPAN', {{'class':'fd-wiki-chip', 'data-token':'[[fdpage:42]]'}}),
|
||||
E('SPAN', {{'class':'fd-math-inline', 'data-tex':'x^2'}}),
|
||||
T(' fin')
|
||||
]);
|
||||
root.querySelector = () => ({{}}); // force le chemin formaté
|
||||
const md = gtMd(root);
|
||||
const html = mdEsc(md);
|
||||
console.log(JSON.stringify({{md:md, html:html}}));
|
||||
"""
|
||||
out = subprocess.run([node, "-e", script], capture_output=True, text=True,
|
||||
timeout=30, encoding="utf-8")
|
||||
assert out.returncode == 0, out.stderr
|
||||
data = json.loads(out.stdout)
|
||||
assert data["md"] == ("**gras***italique*__souligne__~~barre~~`code`==surligne=="
|
||||
"[lien](https://example.com/x)[[fdpage:42]]$$x^2$$ fin"), data["md"]
|
||||
for token in ("<strong>gras</strong>", "<u>souligne</u>", "<mark>surligne</mark>",
|
||||
"<code>code</code>", 'href="https://example.com/x"',
|
||||
'class="fd-wiki-chip"', 'data-tex="x^2"'):
|
||||
assert token in data["html"], token
|
||||
@@ -0,0 +1,136 @@
|
||||
"""7.63.0 — menus mobiles façon Notion : barre horizontale au « / » + feuille plein écran."""
|
||||
|
||||
import json
|
||||
import shutil
|
||||
import subprocess
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
SRC = (ROOT / "static" / "js" / "page_editor_scripts.js").read_text(encoding="utf-8")
|
||||
CSS = (ROOT / "static" / "css" / "app.css").read_text(encoding="utf-8")
|
||||
|
||||
|
||||
def _slice(src: str, start: str, end: str) -> str:
|
||||
i = src.index(start)
|
||||
return src[i:src.index(end, i)]
|
||||
|
||||
|
||||
# ── Barre horizontale : les 15 boutons, dans l'ordre de la description ─────
|
||||
|
||||
def test_bar_items_in_order():
|
||||
chunk = _slice(SRC, "const MTB={", "open(i,el){const d=this.el()")
|
||||
order = ["['plus'", "['turn'", "['at'", "['comment'", "['image'", "['trash'",
|
||||
"['left'", "['right'", "['up'", "['down'", "['undo'", "['redo'",
|
||||
"['color'", "['more'", "['kbd'"]
|
||||
positions = [chunk.index(o) for o in order]
|
||||
assert positions == sorted(positions), positions
|
||||
# les 4 entrées « texte + chevron » de la description
|
||||
for w in ("'plus'", "'turn'", "'color'", "'more'"):
|
||||
assert w in chunk, w
|
||||
assert "fd-mtb-wide" in chunk and "fd-mtb-caret" in chunk
|
||||
|
||||
|
||||
# ── Chaque bouton → une action réelle (pas de bouton mort) ─────────────────
|
||||
|
||||
def test_bar_actions_are_real():
|
||||
act = _slice(SRC, "act(k,btn){", "\n };")
|
||||
for token in ("sheet('Insert block'", "sheet('Turn into'", "sheet('Color'",
|
||||
"blockMenuOpen(", "a.blur()", "E.openMention(el)",
|
||||
"E.commentBlock(idx)", "E.applySlash('image')", "E.deleteSelected(idx)",
|
||||
"E.moveBlock(bid,k)", "E.undo()", "E.redo()"):
|
||||
assert token in act, token
|
||||
# « More » ouvre bien le menu contextuel de bloc existant (desktop)
|
||||
assert "this.close();blockMenuOpen(" in act
|
||||
|
||||
|
||||
# ── Feuille plein écran : titre centré + Cancel + listes réutilisées ───────
|
||||
|
||||
def test_fullscreen_sheet():
|
||||
sheet = _slice(SRC, "sheet(title,html,handler){", "_insertHtml(){")
|
||||
for token in ("fd-msheet-head", "fd-msheet-title", "fd-msheet-cancel", "Cancel",
|
||||
"fd-msheet-list block-menu"):
|
||||
assert token in sheet, token
|
||||
# contenu : items slash partagés + sous-menus de bloc partagés
|
||||
ins = _slice(SRC, "_insertHtml(){", "_bmAct(")
|
||||
assert "_GROUP_LABEL[g.name]" in ins and "_slashItemHtml" in ins
|
||||
assert "function _blockTurnItems(bid)" in SRC and "function _blockColorItems(bid)" in SRC
|
||||
# choix d'un item → applySlash via SM.sel (ferme tout)
|
||||
assert "SM.sel(it.dataset.sid)" in SRC
|
||||
|
||||
|
||||
# ── Branchement sur le slash : mobile = barre, desktop = popup intacte ─────
|
||||
|
||||
def test_mobile_hook():
|
||||
for token in ("function _fdMobile()", "max-width: 768px",
|
||||
"if(_fdMobile()){SM._o=true;MTB.open(i,el);return;}",
|
||||
"MTB.close();", "!MTB.contains(ev.target)",
|
||||
"else if(SM.isOpen)"):
|
||||
assert token in SRC, token
|
||||
# le popup desktop (positionnement + focus de la recherche) est toujours là
|
||||
assert "SM._e.style.display='flex'" in SRC and "SM._in.focus()" in SRC
|
||||
# la barre se referme quand le / disparaît
|
||||
assert "if(t.charAt(0)!=='/')SM.close();" in SRC
|
||||
|
||||
|
||||
# ── Déplacement de bloc (↑↓ ordre, → indent, ← outdent) ────────────────────
|
||||
|
||||
def test_move_block_logic():
|
||||
m = _slice(SRC, "moveBlock(bid,dir){", "applyLastColor(idx){")
|
||||
for token in ("dir==='up'", "dir==='down'", "dir==='right'", "parent.children",
|
||||
"pushHistory()", "this.sync()", "_focusBid(bid)"):
|
||||
assert token in m, token
|
||||
|
||||
|
||||
# ── Styles ────────────────────────────────────────────────────────────────
|
||||
|
||||
def test_styles():
|
||||
for sel in (".fd-mtb {", ".fd-mtb .fd-mtb-item {", ".fd-mtb .fd-mtb-wide {",
|
||||
".fd-msheet {", ".fd-msheet-head {", ".fd-msheet-cancel {",
|
||||
".fd-msheet-list.block-menu {", ".fd-msheet .bm-item {",
|
||||
".fd-msheet .slash-item {"):
|
||||
assert sel in CSS, sel
|
||||
|
||||
|
||||
# ── Comportement réel : moveBlock sous node ───────────────────────────────
|
||||
|
||||
def test_move_block_for_real():
|
||||
node = shutil.which("node")
|
||||
if not node:
|
||||
pytest.skip("node absent : test comportemental ignoré")
|
||||
method = _slice(SRC, "moveBlock(bid,dir){", "applyLastColor(idx){")
|
||||
script = f"""
|
||||
function _rtSync(){{}}
|
||||
const E = {{
|
||||
blocks:[{{id:'a',type:'paragraph',content:'A'}},
|
||||
{{id:'tg',type:'toggle',content:'T',expanded:true,children:[]}},
|
||||
{{id:'c',type:'paragraph',content:'C'}}],
|
||||
sync(){{}}, pushHistory(){{}}, dirty:false, autoSave(){{}}, render(){{}},
|
||||
_focusBid(){{}}, showToast(){{}}, msgs:[],
|
||||
{method}
|
||||
}};
|
||||
E.moveBlock('c','right'); // C s'indente dans le toggle
|
||||
const indent = {{kids:E.blocks[1].children.map(b=>b.id).join(','), top:E.blocks.map(b=>b.id).join(',')}};
|
||||
E.moveBlock('c','left'); // C ressort à la racine : a,tg,c
|
||||
const top2 = E.blocks.map(b=>b.id).join(',');
|
||||
E.moveBlock('a','down'); // A descend : tg,a,c
|
||||
const ordre1 = E.blocks.map(b=>b.id).join(',');
|
||||
E.moveBlock('c','up'); // C remonte : tg,c,a
|
||||
const ordre2 = E.blocks.map(b=>b.id).join(',');
|
||||
E.moveBlock('c','up'); // encore : c,tg,a
|
||||
const ordre3 = E.blocks.map(b=>b.id).join(',');
|
||||
E.moveBlock('c','up'); // déjà en haut → toast, inchangé
|
||||
const ordre4 = E.blocks.map(b=>b.id).join(',');
|
||||
console.log(JSON.stringify({{indent:indent, top2:top2, ordre1:ordre1, ordre2:ordre2, ordre3:ordre3, ordre4:ordre4}}));
|
||||
"""
|
||||
out = subprocess.run([node, "-e", script], capture_output=True, text=True,
|
||||
timeout=30, encoding="utf-8")
|
||||
assert out.returncode == 0, out.stderr
|
||||
d = json.loads(out.stdout)
|
||||
assert d["indent"] == {"kids": "c", "top": "a,tg"}, d
|
||||
assert d["top2"] == "a,tg,c", d
|
||||
assert d["ordre1"] == "tg,a,c", d
|
||||
assert d["ordre2"] == "tg,c,a", d
|
||||
assert d["ordre3"] == "c,tg,a", d
|
||||
assert d["ordre4"] == "c,tg,a", d # garde « déjà en haut »
|
||||
@@ -0,0 +1,139 @@
|
||||
"""7.64.0 — commentaires façon Notion (ancres jaunes + tiroir) & réactions sur texte."""
|
||||
|
||||
from pathlib import Path
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
SRC = (ROOT / "static" / "js" / "page_editor_scripts.js").read_text(encoding="utf-8")
|
||||
TPL = (ROOT / "app" / "templates" / "_page_editor_content.html").read_text(encoding="utf-8")
|
||||
CSS = (ROOT / "static" / "css" / "app.css").read_text(encoding="utf-8")
|
||||
PICKER = (ROOT / "app" / "templates" / "_icon_picker.html").read_text(encoding="utf-8")
|
||||
PSTORE = (ROOT / "static" / "js" / "_icon_picker_2.js").read_text(encoding="utf-8")
|
||||
|
||||
|
||||
# ── Backend : migration + endpoints ────────────────────────────────────────
|
||||
|
||||
def test_text_reactions_table_exists(client): # le fixture client initialise le schéma
|
||||
from app.db import get_conn
|
||||
|
||||
with get_conn() as conn:
|
||||
cols = {r[1] for r in conn.execute("PRAGMA table_info(text_reactions)").fetchall()}
|
||||
assert {"id", "page_id", "block_id", "anchor_start", "anchor_end", "emoji",
|
||||
"user_id", "created_at"} <= cols, cols
|
||||
|
||||
|
||||
def test_reactions_endpoints_registered():
|
||||
from app.routers.collaboration import router
|
||||
|
||||
methods = {(r.path, m) for r in router.routes for m in r.methods}
|
||||
assert ("/api/pages/{page_id}/reactions", "GET") in methods
|
||||
assert ("/api/pages/{page_id}/reactions", "POST") in methods
|
||||
|
||||
|
||||
def test_toggle_reaction_api(client):
|
||||
"""Le POST bascule (added → removed → added) et le GET regroupe par plage."""
|
||||
from app.auth.session import SessionManager
|
||||
from app.db import get_conn
|
||||
|
||||
with get_conn() as conn:
|
||||
conn.execute("INSERT INTO users (login, full_name, email) VALUES (?,?,?)",
|
||||
("v764u", "V764 User", "[email protected]"))
|
||||
uid = conn.execute("SELECT id FROM users WHERE login='v764u'").fetchone()["id"]
|
||||
cur = conn.execute(
|
||||
"INSERT INTO pages (workspace, title, content, content_format) VALUES (?,?,?,?)",
|
||||
("u764", "React Page", "[]", "blocks"))
|
||||
pid = cur.lastrowid
|
||||
conn.commit()
|
||||
cookies = {"flowdeck_session": SessionManager.create_session(
|
||||
{"id": uid, "login": "v764u", "is_admin": 0})}
|
||||
payload = {"block_id": "b1", "anchor_start": 0, "anchor_end": 5, "emoji": "👍"}
|
||||
|
||||
r = client.post(f"/api/pages/{pid}/reactions", json=payload, cookies=cookies)
|
||||
assert r.status_code == 200 and r.json()["status"] == "added"
|
||||
r = client.post(f"/api/pages/{pid}/reactions", json=payload, cookies=cookies)
|
||||
assert r.status_code == 200 and r.json()["status"] == "removed"
|
||||
r = client.post(f"/api/pages/{pid}/reactions", json=payload, cookies=cookies)
|
||||
assert r.json()["status"] == "added"
|
||||
|
||||
r = client.get(f"/api/pages/{pid}/reactions", cookies=cookies)
|
||||
assert r.status_code == 200
|
||||
rows = r.json()["reactions"]
|
||||
assert len(rows) == 1
|
||||
assert rows[0]["emoji"] == "👍" and rows[0]["count"] == 1 and rows[0]["mine"] == 1
|
||||
|
||||
# plage vide → 400
|
||||
bad = dict(payload, anchor_start=4, anchor_end=4)
|
||||
r = client.post(f"/api/pages/{pid}/reactions", json=bad, cookies=cookies)
|
||||
assert r.status_code == 400
|
||||
|
||||
|
||||
# ── Toolbar : bouton réaction ──────────────────────────────────────────────
|
||||
|
||||
def test_toolbar_has_react_button():
|
||||
assert 'fmtReact()' in TPL
|
||||
assert 'data-tooltip="React to selected text"' in TPL
|
||||
# position : 3ᵉ ligne, après le surlignage, avant le code
|
||||
chunk = TPL[TPL.index('class="format-toolbar"'):TPL.index("Copy Link Toast")]
|
||||
order = ["fmtHighlight()", "fmtReact()", "fmtCodeBlock()", "fmtMore($event)"]
|
||||
positions = [chunk.index(o) for o in order]
|
||||
assert positions == sorted(positions), positions
|
||||
|
||||
|
||||
def test_fmt_react_opens_picker_with_selection():
|
||||
js = SRC[SRC.index("fmtReact(){"):SRC.index("toggleComments(){")]
|
||||
for token in ("FDIconPicker.openFor", "title:text", "onPick:",
|
||||
"toggleReaction(bid,span.start,span.end,emoji)", "_selSpan(bel,this._sel.range)"):
|
||||
assert token in js, token
|
||||
|
||||
|
||||
# ── Ancres commentées + pastilles ──────────────────────────────────────────
|
||||
|
||||
def test_anchors_painting():
|
||||
for token in ("function _wrapAnchored(", "_paintAnchors()", "fd-anchor",
|
||||
"fd-react-chip", "data-react-bid", "data-react-start", "openThread(cid)",
|
||||
"loadReactions()", "toggleReaction(bid,start,end,emoji)"):
|
||||
assert token in SRC, token
|
||||
# repeint après chaque reconstruction du bloc ET après le chargement
|
||||
assert "this._paintAnchors();}catch(e){}" in SRC # fin de render()
|
||||
assert "this._paintAnchors();\n" in SRC # fin de loadComments/loadReactions
|
||||
# la pastille n'est pas du contenu lu/sauvé
|
||||
assert "n.classList.contains('fd-react-chip')" in SRC # gtTok
|
||||
assert "cl.contains('fd-react-chip')" in SRC # gtMd
|
||||
# offsets source (les annotations ne décalent pas les ancres)
|
||||
assert "function _srcOffset(" in SRC and "_srcNodeLen(" in SRC
|
||||
# clic ancre → fil ; clic pastille → sélecteur
|
||||
assert "t.closest('.fd-react-chip')" in SRC
|
||||
assert "t.closest('.fd-anchor[data-cid]')" in SRC
|
||||
|
||||
|
||||
# ── Tiroir de commentaires (image 1) ───────────────────────────────────────
|
||||
|
||||
def test_drawer_markup():
|
||||
for token in ('class="ct-head"', 'class="ct-avatar"', 'class="ct-name"',
|
||||
'class="ct-time"', 'class="ct-actions"', 'class="ct-menu"',
|
||||
"copyCommentLink(c.id)", "deleteComment(c.id)", "resolveComment(c)",
|
||||
':data-thread="c.id"', 'placeholder="Add a comment..."',
|
||||
"commentAt()", "class=\"ct-send\"", "addPageComment()"):
|
||||
assert token in TPL, token
|
||||
# le bouton ✓ bascule resolve/reopen (l'objet, pas l'id seul)
|
||||
assert "resolveComment(c)" in TPL and "async resolveComment(c)" in SRC
|
||||
# hash #cmt- → centrage du fil
|
||||
assert "#cmt-" in SRC and "scrollIntoView" in SRC
|
||||
# styles du tiroir
|
||||
for sel in (".comment-thread {", ".ct-head {", ".ct-avatar {", ".ct-menu {",
|
||||
".ct-input-row {", ".ct-send {", ".fd-anchor {", ".fd-react-chip {"):
|
||||
assert sel in CSS, sel
|
||||
|
||||
|
||||
# ── Sélecteur d'émoji (image 3) : mode réaction ────────────────────────────
|
||||
|
||||
def test_picker_reaction_mode():
|
||||
for token in ("fdip-title", "fdip-title-text", "fdip-title-grip",
|
||||
"$store.fdIconPicker.title", "Filter...", "Recent"):
|
||||
assert token in PICKER, token
|
||||
for token in ("this.title = opts.title || ''", "this.category = 'people'",
|
||||
"this.title = ''"):
|
||||
assert token in PSTORE, token
|
||||
# la ligne « Recent » au-dessus de la grille n'apparaît qu'en mode réaction
|
||||
assert "$store.fdIconPicker.title && $store.fdIconPicker.category !== 'recent'" in PICKER
|
||||
# onglets masqués en mode réaction (emoji only)
|
||||
assert 'x-show="!$store.fdIconPicker.title"' in PICKER
|
||||
Reference in New Issue
Block a user