Working on label placemenT

Author: robmoffat

server/kite9-server-java/src/main/resources/static/public/behaviours/containers/insert/containers-insert.js

@@ -56,7 +56,7 @@ export function initInsertPaletteCallback(command, containment, insertableSelect
 					// insert it in the correct place in the svg.
 					const before = getBefore(e, palette.getOpenEvent(), []);
 					if (before == undefined) {
-						into.appendChild(clone)
+						e.appendChild(clone)
 					} else {
 						before.parentElement.insertBefore(clone, before);
 					}

server/kite9-server-java/src/main/resources/static/public/behaviours/labels/label.svg renamed to server/kite9-server-java/src/main/resources/static/public/behaviours/labels/add/add.svg

@@ -32,7 +32,7 @@ export function createInsertLabelStep(e, templateUri, command) {
 }
 
 
-export function initLabelContextMenuCallback(command, templateUri, selector, action) {
+export function initAddLabelContextMenuCallback(command, templateUri, selector, action) {
 
 	if (selector == undefined) {
 		selector = labelableSelector;
@@ -50,7 +50,7 @@ export function initLabelContextMenuCallback(command, templateUri, selector, act
 		const selectedElements = hasLastSelected(selector());
 
 		if (selectedElements.length > 0) {
-			contextMenu.addControl(event, "/public/behaviours/labels/label.svg", "Add Label", 
+			contextMenu.addControl(event, "/public/behaviours/labels/add/add.svg", "Add Label", 
 				function(e2, selector) {
 					contextMenu.destroy();
 					selectedElements.forEach(e => action(e, templateUri, command));

server/kite9-server-java/src/main/resources/static/public/behaviours/labels/label.js renamed to server/kite9-server-java/src/main/resources/static/public/behaviours/labels/add/labels-add.js

@@ -0,0 +1,62 @@
+import { getMainSvg } from '/public/bundles/screen.js'
+import { hasLastSelected, parseInfo, getContainingDiagram, reverseDirection, createUniqueId } from '/public/bundles/api.js'
+
+
+export function labelableSelector() {
+	const labelables = Array.from(getMainSvg().querySelectorAll("[k9-ui~=label].selected"));
+	return labelables;
+}
+
+export function createPlaceLabelStep(e, templateUri, command) {
+	const info = parseInfo(e);
+	const end = info.end;
+	const linkId = info.terminates ? info.terminates : e.getAttribute("id");
+	const newId = createUniqueId();
+	
+	command.push({
+		"type": 'InsertUrl',
+		"fragmentId": linkId,
+		"uriStr": templateUri,
+		"newId" : newId,
+	});
+	
+	if (end) {
+		command.push({
+			"type": "ReplaceAttr",
+			"fragmentId": newId,
+			"name": "end",
+			"to" : end,
+			"from" : e.getAttribute("end")
+		});
+	}
+}
+
+
+export function initPlaceLabelContextMenuCallback(command, templateUri, selector, action) {
+	
+	if (selector == undefined) {
+		selector = labelableSelector;
+	}
+	
+	if (action == undefined) {
+		action = createInsertLabelStep;
+	}
+	
+	/**
+	 * Provides a label option for the context menu
+	 */
+	return function(event, contextMenu) {
+		
+		const selectedElements = hasLastSelected(selector());
+		
+		if (selectedElements.length > 0) {
+			contextMenu.addControl(event, "/public/behaviours/labels/place/place.svg", "Add Label", 
+				function(e2, selector) {
+					contextMenu.destroy();
+					selectedElements.forEach(e => action(e, templateUri, command));
+					command.perform();
+				}		
+			)
+		}
+	}
+}

server/kite9-server-java/src/main/resources/static/public/behaviours/labels/place/labels-place.js

@@ -42,6 +42,7 @@
 
   <xsl:template name="adl-diagram-constants">
   	<xsl:call-template name="links-diagram-constants" />
+  	<xsl:call-template name="labels-diagram-constants" />
   </xsl:template>
 
   <xsl:template name="adl-diagram-palettes">

server/kite9-server-java/src/main/resources/static/public/behaviours/labels/place/noun-arrow-down.svg

@@ -45,7 +45,7 @@
   <xsl:template match="adl:container">
     <xsl:call-template name="formats-container">
       <xsl:with-param name="k9-rounding">10pt</xsl:with-param>
-      <xsl:with-param name="k9-ui">drag delete align connect insert autoconnect layout</xsl:with-param>
+      <xsl:with-param name="k9-ui">drag delete align connect insert autoconnect layout label</xsl:with-param>
     </xsl:call-template>
   </xsl:template>
 
@@ -54,7 +54,7 @@
       <xsl:with-param name="k9-rounding">10pt</xsl:with-param>
       <xsl:with-param name="k9-texture">none</xsl:with-param>
       <xsl:with-param name="k9-highlight">pulse stroke</xsl:with-param>
-      <xsl:with-param name="k9-ui">drag delete align connect insert autoconnect layout</xsl:with-param>
+      <xsl:with-param name="k9-ui">drag delete align connect insert autoconnect layout label</xsl:with-param>
     </xsl:call-template>
   </xsl:template>
 

server/kite9-server-java/src/main/resources/static/public/behaviours/labels/place/noun-arrow-left.svg

@@ -18,7 +18,7 @@
     <xsl:param name="k9-palette">connected</xsl:param>
     <xsl:param name="k9-rounding">5pt</xsl:param>
     <xsl:param name="k9-texture">background</xsl:param>
-    <xsl:param name="k9-ui">drag delete align connect insert autoconnect label</xsl:param>
+    <xsl:param name="k9-ui">drag delete align connect insert autoconnect</xsl:param>
 
     <xsl:param name="shape">
       <xsl:apply-templates mode="shape" select=".">

server/kite9-server-java/src/main/resources/static/public/behaviours/labels/place/noun-arrow-right.svg

@@ -8,22 +8,13 @@
   <xsl:template name="labels-basic">
     <xsl:param name="k9-rounding" >5pt</xsl:param>
     <xsl:param name="text"><text><xsl:value-of select="text()" /></text></xsl:param>
-    <xsl:call-template name="formats-container">
+    <xsl:call-template name="formats-text-shape-inline">
       <xsl:with-param name="k9-texture">none</xsl:with-param>
       <xsl:with-param name="k9-highlight"></xsl:with-param>
       <xsl:with-param name="k9-elem">label</xsl:with-param>
-      
-      <xsl:with-param name="id" />
-      <xsl:with-param name="k9-ui">delete label</xsl:with-param>
-      
-      <xsl:with-param name="content">
-        <xsl:call-template name="formats-text-shape-inline">
-          <xsl:with-param name="k9-elem">label-inner</xsl:with-param>
-          <xsl:with-param name="k9-rounding" select="$k9-rounding" />
-          <xsl:with-param name="k9-texture">none</xsl:with-param>
-          <xsl:with-param name="text" select="$text" />
-        </xsl:call-template>    
-      </xsl:with-param>
+      <xsl:with-param name="k9-contains" />
+      <xsl:with-param name="k9-palette">label</xsl:with-param>
+      <xsl:with-param name="k9-ui">delete edit xml</xsl:with-param>
     </xsl:call-template>
 
   </xsl:template> 
@@ -36,8 +27,12 @@
     <adl:css>@import url('/public/templates/labels/labels-elements.css');</adl:css>
   </xsl:template>
 
+  <xsl:template name="labels-diagram-constants">
+     <adl:constant name="label-template-uri" url="/public/templates/labels/palette.adl#label" />
+  </xsl:template>
+    
   <xsl:template name="labels-diagram-palettes">
-     <adl:palette contains="connected cell table" url="/public/templates/grid/palette.adl" />
+     <adl:palette contains="label" url="/public/templates/grid/palette.adl" />
   </xsl:template>  
 
 </xsl:stylesheet>

server/kite9-server-java/src/main/resources/static/public/behaviours/labels/place/noun-arrow-up.svg

@@ -1,12 +1,13 @@
 import { once } from '/public/bundles/ensure.js'
-import { initLabelContextMenuCallback } from '/public/behaviours/labels/label.js' 
+import { initAddLabelContextMenuCallback } from '/public/behaviours/labels/add/labels-add.js' 
+import { initPlaceLabelContextMenuCallback } from '/public/behaviours/labels/place/labels-place.js' 
 import { command, metadata, contextMenu } from '/public/templates/adl/adl.js'
 
 function initLabels() {
 
 	if (metadata.isEditor()) {
 
-		contextMenu.add(initLabelContextMenuCallback(command, document.params['label-template-uri']));
+		contextMenu.add(initAddLabelContextMenuCallback(command, document.params['label-template-uri']));
 
 	}
 }

server/kite9-server-java/src/main/resources/static/public/behaviours/labels/place/noun-bottom-left.svg

@@ -21,8 +21,8 @@
   </xsl:template>
 
   <xsl:template name="links-diagram-constants">
-     <adl:constant name="link-template-uri" url="/public/templates/links/common-links.adl#l1" />
-     <adl:constant name="align-template-uri" url="/public/templates/links/common-links.adl#align" />
+     <adl:constant name="link-template-uri" url="/public/templates/links/links-palette.adl#l2" />
+     <adl:constant name="align-template-uri" url="/public/templates/links/links-palette.adl#align" />
   </xsl:template>
 
   <xsl:template name="links-diagram-palettes">