[fix] Correctly creating link anchors in TextEditor & dragging items to hotbar

src/e2e/actor/createItemMacro.test.js

@@ -0,0 +1,70 @@
+import { createOseMacro } from '../../module/macros';
+import { trashChat, waitForInput } from '../testUtils';
+
+
+export const key = 'ose.actor.macro';
+export const options = {
+    displayName: 'The Character Sheet: Item Macros'
+};
+
+export default ({ before, beforeEach, after, describe, it, expect, assert, ...context }) => {
+    const testCharacterName = 'Quench Test Character';
+    const prepareActor = async (data) => {
+        await trashChat();
+        await trashActor();
+
+        return Actor.create({
+            ...data,
+            name: testCharacterName,
+            type: 'character'
+        });
+    };
+    const testActor = () => game.actors.getName(testCharacterName);
+    const trashActor = () => testActor()?.delete();
+    const trashMacro = async () => {
+        await game.macros.find(o => o.name === "Test Macro Item")?.delete();
+        await game.user.assignHotbarMacro(null, 1);
+    }
+    const createItem = (type) => { return testActor()?.createEmbeddedDocuments("Item", [{ type: type, name: "Test Macro Item" }]) };
+
+    const createItemMacroData = (item) => {
+        const dragData = item.toDragData();
+        dragData.item = item;
+        dragData.type = "Item"
+        return dragData
+    };
+
+    const canCreate = async (type) => {
+        await createItem(type);
+        const item = testActor().items.contents[0];
+        const data = createItemMacroData(item);
+        const macro = await createOseMacro(data, 1);
+        await waitForInput();
+
+        const createdMacro = game.user.getHotbarMacros()[0];
+        expect(createdMacro?.macro?.command.indexOf("game.ose.rollItemMacro")).not.equal(-1)
+    }
+
+    before(async () => {
+        await trashChat();
+    })
+
+    describe('Item Macro', () => {
+        before(async () => {
+            await prepareActor();
+            trashMacro();
+        })
+
+        after(async () => {
+            await trashChat();
+            await trashActor();
+        })
+
+        afterEach(() => {
+            trashMacro();
+        })
+
+        it('Create weapon macro', async () => { await canCreate("weapon") })
+        it('Create spell macro', async () => { await canCreate("spell") })
+    })
+};

src/e2e/index.ts

@@ -1,3 +1,8 @@
+import characterItemMacroTests, {
+  key as characterItemMacroKey,
+  options as characterItemMacroOptions
+} from './actor/createItemMacro.test';
+
 import characterTests, {
   key as characterKey,
   options as characterOptions
@@ -46,7 +51,8 @@ type Quench = {
 }
 
 Hooks.on('quenchReady', async (quench: Quench) => {
-  quench.registerBatch(characterKey, characterTests, characterOptions)
+  quench.registerBatch(characterItemMacroKey, characterItemMacroTests, characterItemMacroOptions);
+  quench.registerBatch(characterKey, characterTests, characterOptions);
   // Character data model classes
   quench.registerBatch(dataModelCharacterACKey, dataModelCharacterACTests, dataModelCharacterACOptions);
   quench.registerBatch(dataModelCharacterScoresKey, dataModelCharacterScoresTests, dataModelCharacterScoresOptions);

src/lang/en.json

@@ -305,7 +305,9 @@
   "OSE.CombatFlag.SpellDeclared": "Spell Declared",
   "OSE.CombatFlag.RetreatFromMeleeDeclared": "Retreat From Melee Declared",
 
-  "OSE.warn.moreThanOneItemWithName": "Your controlled Actor {actorName} has more than one Item with name ${itemName}. The first matched Item will be chosen.",
+  "OSE.warn.moreThanOneItemWithName": "Your controlled Actor {actorName} has more than one Item with name {itemName}. The first matched Item will be chosen.",
+  "OSE.warn.macrosOnlyForOwnedItems": "Only Items owned by Actor may be used to create macros.",
+  "OSE.warn.macrosNoTokenOwnedInScene": "No controlled token in scene",
 
   "OSE.error.macrosOnlyForOwnedItems": "You can only create macro buttons for owned Items",
   "OSE.error.noItemWithName": "Your controlled Actor {actorName} does not have an item named {itemName}.",

src/module/actor/actor-sheet.js

@@ -227,25 +227,26 @@ export class OseActorSheet extends ActorSheet {
     let itemIdsArray = [];
     if (event.target.classList.contains("content-link")) return;
 
-    // Create drag data
-    const dragData = {
-      actorId: this.actor.id,
-      sceneId: this.actor.isToken ? canvas.scene?.id : null,
-      tokenId: this.actor.isToken ? this.actor.token.id : null,
-      pack: this.actor.pack,
-    };
+    let dragData;
 
     // Owned Items
     if (li.dataset.itemId) {
       const item = this.actor.items.get(li.dataset.itemId);
-      dragData.type = "Item";
-      dragData.data = item;
+      dragData = item.toDragData();
+      dragData.item = item;
+      dragData.type = "Item"; 
       if (item.type === "container" && item.system.itemIds.length) {
         //otherwise JSON.stringify will quadruple stringify for some reason
         itemIdsArray = item.system.itemIds;
       }
     }
 
+    // Create drag data
+    dragData.actorId = this.actor.id;
+    dragData.sceneId = this.actor.isToken ? canvas.scene?.id : null;
+    dragData.tokenId = this.actor.isToken ? this.actor.token.id : null;
+    dragData.pack = this.actor.pack;
+
     // Active Effect
     if (li.dataset.effectId) {
       const effect = this.actor.effects.get(li.dataset.effectId);

src/module/macros.js

@@ -11,11 +11,11 @@
  */
 export async function createOseMacro(data, slot) {
   if (data.type !== "Item") return;
-  if (!("data" in data))
+  if ( data.uuid.indexOf("Item.") <= 0 )
     return ui.notifications.warn(
-      game.i18.localize("OSE.warn.macrosOnlyForOwnedItems")
+      game.i18n.localize("OSE.warn.macrosOnlyForOwnedItems")
     );
-  const item = data.data;
+  const item = data.item;
 
   // Create the macro command
   const command = `game.ose.rollItemMacro("${item.name}");`;
@@ -45,6 +45,10 @@ export async function createOseMacro(data, slot) {
  */
 export function rollItemMacro(itemName) {
   const speaker = ChatMessage.getSpeaker();
+  // Active actor, or inactive actor + token on scene allowed
+  if (!(speaker.actor && speaker.scene)) 
+    return ui.notifications.warn(game.i18n.localize("OSE.warn.macrosNoTokenOwnedInScene"));
+
   let actor;
   if (speaker.token) actor = game.actors.tokens[speaker.token];
   if (!actor) actor = game.actors.get(speaker.actor);
@@ -60,7 +64,7 @@ export function rollItemMacro(itemName) {
     );
   } else if (items.length === 0) {
     return ui.notifications.error(
-      game.i18n.format("OSE.warn.noItemWithName", {
+      game.i18n.format("OSE.error.noItemWithName", {
         actorName: actor.name,
         itemName: itemName,
       })

src/ose.js

@@ -133,9 +133,11 @@ Hooks.once("setup", function () {
 });
 
 Hooks.once("ready", async () => {
-  Hooks.on("hotbarDrop", (bar, data, slot) =>
-    macros.createOseMacro(data, slot)
-  );
+  Hooks.on("hotbarDrop", (bar, data, slot) => {
+    macros.createOseMacro(data, slot);
+    // Returning false to stop the rest of hotbarDrop handling.
+    return false;
+  });
 });
 
 // License info