@playpilot/tpi 7.0.2 → 7.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@playpilot/tpi",
-	"version": "7.0.2",
+	"version": "7.0.4",
 	"type": "module",
 	"scripts": {
 		"dev": "vite dev",

package/src/lib/explore.ts

@@ -2,6 +2,7 @@ import { mount, unmount } from 'svelte'
 import Explore from '../routes/components/Explore/Explore.svelte'
 
 export const exploreParentSelector = '[data-playpilot-explore]'
+export const explorePreConsentSelector = '[data-playpilot-pre-consent-explore]'
 
 let exploreInsertedComponent: object | null = null
 
@@ -14,6 +15,7 @@ export function insertExplore(): void {
   if (!target) return
 
   destroyExplore()
+  document.querySelector<HTMLElement>(explorePreConsentSelector)?.remove()
 
   target.innerHTML = ''
   exploreInsertedComponent = mount(Explore, { target })

package/src/routes/+layout.svelte

@@ -97,6 +97,12 @@
           <li>Anatomy of a Fall</li>
           <li>Killers of the Flower Moon</li>
         </ul>
+
+        <h2>Example of short manual match</h2>
+        <div>
+          <p><em>The Testaments</em> er en spændende fortsættelse i universet fra <em>The Handmaid’s Tale</em> og bygger på Margaret Atwoods populære bog. Serien dykker endnu dybere ned i det dystopiske samfund Gilead og følger nye karakterer, der kæmper imod regimet.</p><p><strong>Star Wars: Maul – Shadow Lord</strong></p>
+          <p>Denne serie handler om at Maul forsøger at genopbygge sit kriminelle syndikat på en planet, der endnu ikke er under Imperiets kontrol. Her møder han en desillusioneret ung jedi-padawan, som måske kan blive den lærling, han har brug for i sin jagt på hævn.</p>
+        </div>
       </article>
     {/key}
   {/if}

package/src/routes/components/Editorial/ManualInjection.svelte

@@ -87,8 +87,9 @@
     // Get the node the text is in. If the content of the node is very short we use the parent node instead.
     // This is meant for content that is inside of other elements such as <p>Some <strong>word</strong> in a sentence</p>
     // If we selected "word", we'd still want the full sentence, rather than just the "word".
+    // We don't do this if the node is a paragraph, since that implies it is a full sentence by itself at least.
     let node = range.startContainer
-    while((node.textContent || '').length <= selectionText.length * 3 && node.parentNode) {
+    while((node.textContent || '').length <= selectionText.length * 3 && node.parentNode && node.nodeName !== 'P') {
       // Stop when reaching the parent or any child of the parent that doesn't contain any extra content.
       // This prevents matching on text outside of elements that are top level already.
       if (node.parentNode.textContent === injectionsParent.textContent) break
@@ -103,9 +104,8 @@
     const absoluteStart = getAbsoluteOffset(node, range.startContainer, range.startOffset)
     const absoluteEnd = getAbsoluteOffset(node, range.endContainer, range.endOffset)
 
-    // Find sentence boundaries
     const before = fullText.slice(0, absoluteStart).lastIndexOf('.')
-    const afterMatch = fullText.slice(absoluteEnd).match(/[.!?]/)
+    const afterMatch = fullText.slice(absoluteEnd).match(/[.!?\n]/)
     const after = afterMatch ? absoluteEnd + afterMatch.index! : fullText.length
 
     const sentenceStart = before === -1 ? 0 : before + 1

package/src/tests/lib/explore.test.js

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { destroyExplore, insertExplore, insertExploreIntoNavigation } from '$lib/explore'
+import { destroyExplore, explorePreConsentSelector, insertExplore, insertExploreIntoNavigation } from '$lib/explore'
 import { mount, unmount } from 'svelte'
 vi.mock('svelte', () => ({
   mount: vi.fn(() => true),
@@ -36,6 +36,19 @@ describe('explore.js', () => {
 
       expect(document.querySelector('span')).not.toBeTruthy()
     })
+
+    it('Should remove pre-consent elements if present', () => {
+      document.body.innerHTML = `
+        <div data-playpilot-explore><span></span></div>
+        <div data-playpilot-pre-consent-explore></div>
+      `
+
+      expect(document.querySelector(explorePreConsentSelector)).toBeTruthy()
+
+      insertExplore()
+
+      expect(document.querySelector(explorePreConsentSelector)).not.toBeTruthy()
+    })
   })
 
   describe('destroyExplore', () => {

package/src/tests/routes/components/Editorial/ManualInjection.test.js

@@ -186,6 +186,48 @@ describe('ManualInjection.svelte', () => {
     })
   })
 
+  it('Should not select parent if content is too short but is in a paragraph', async () => {
+    vi.mocked(searchTitles).mockResolvedValueOnce([title])
+    vi.mocked(getIndexOfSelection).mockReturnValueOnce({ start: 0, end: 0 })
+
+    document.body.innerHTML = '<main><p>Some paragraph</p> <p>Some other paragraph</p></main>'
+
+    const container = document.querySelectorAll('p')[1]
+
+    // @ts-ignore
+    window.getSelection = vi.fn(() => ({
+      toString: () => 'Some other paragraph',
+      getRangeAt: () => ({
+        commonAncestorContainer: container,
+        startContainer: container,
+        startOffset: 0,
+        endOffset: 0,
+        cloneContents: () => ({ childNodes: [] }),
+      }),
+      anchorNode: container,
+      focusNode: container,
+    }))
+
+    const onsave = vi.fn()
+    const { getByText } = render(ManualInjection, { pageText: document.body.innerText, onsave })
+
+    await fireEvent.mouseUp(window)
+    await fireEvent.click(getByText(title.title))
+    await fireEvent.click(getByText('Add playlink'))
+
+    expect(onsave).toHaveBeenCalledWith({
+      sid: title.sid,
+      title: 'Some other paragraph',
+      sentence: 'Some other paragraph',
+      playpilot_url: `https://www.playpilot.com/show/${title.slug}`,
+      key: expect.any(String),
+      title_details: title,
+      manual: true,
+      phrase_before: expect.any(String),
+      phrase_after: expect.any(String),
+    })
+  })
+
   it('Should not select content if it is outside of given parent', async () => {
     vi.mocked(searchTitles).mockResolvedValueOnce([title])
     vi.mocked(getIndexOfSelection).mockReturnValueOnce({ start: 0, end: 0 })