Merge pull request #1014 from WolframResearch/bugfix/455056

Links to expression URIs will open the expression in a new notebook
WolframResearch · Jan 6, 2025 · 4a37b0d · 4a37b0d
2 parents 2c1d4d0 + 15fc401
commit 4a37b0d
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 11 deletions.
diff --git a/Assets/DisplayFunctions.wxf b/Assets/DisplayFunctions.wxf
diff --git a/Developer/Resources/Styles.wl b/Developer/Resources/Styles.wl
@@ -1515,6 +1515,28 @@ Cell[
 ]
 
 
+
+(* ::Subsection::Closed:: *)
+(*TextExpressionLink*)
+
+
+Cell[
+    StyleData[ "TextExpressionLink" ],
+    TemplateBoxOptions -> {
+        DisplayFunction -> Function @ ButtonBox[
+            #1,
+            Appearance       -> None,
+            BaseStyle        -> { "Text", "Hyperlink" },
+            ButtonFunction   :> CreateDocument @ BinaryDeserialize @ BaseDecode @ #2,
+            DefaultBaseStyle -> { },
+            Evaluator        -> Automatic,
+            Method           -> "Queued"
+        ]
+    }
+]
+
+
+
 (* ::Section::Closed:: *)
 (*Package Footer*)
 

diff --git a/FrontEnd/Assets/Extensions/CoreExtensions.nb b/FrontEnd/Assets/Extensions/CoreExtensions.nb
@@ -11,7 +11,7 @@ Notebook[
   Cell["Chatbook Core.nb Extensions", "Title"],
   Cell[
    StyleData["ChatStyleSheetInformation"],
-   TaggingRules -> <|"StyleSheetVersion" -> "2.0.8.3943617669"|>
+   TaggingRules -> <|"StyleSheetVersion" -> "2.0.15.3945149906"|>
   ],
   Cell[
    StyleData["NotebookAssistant`Text"],
@@ -14078,6 +14078,24 @@ Notebook[
       ]
      ])
    }
+  ],
+  Cell[
+   StyleData["TextExpressionLink"],
+   TemplateBoxOptions -> {
+    DisplayFunction ->
+     (Function[
+      ButtonBox[
+       #1,
+       Appearance -> None,
+       BaseStyle -> {"Text", "Hyperlink"},
+       ButtonFunction :>
+        CreateDocument[BinaryDeserialize[BaseDecode[#2]]],
+       DefaultBaseStyle -> { },
+       Evaluator -> Automatic,
+       Method -> "Queued"
+      ]
+     ])
+   }
   ]
  },
  StyleDefinitions -> "Default.nb"

diff --git a/FrontEnd/StyleSheets/Chatbook.nb b/FrontEnd/StyleSheets/Chatbook.nb
@@ -824,7 +824,7 @@ Notebook[
   ],
   Cell[
    StyleData["ChatStyleSheetInformation"],
-   TaggingRules -> <|"StyleSheetVersion" -> "2.0.8.3943617669"|>
+   TaggingRules -> <|"StyleSheetVersion" -> "2.0.15.3945149906"|>
   ],
   Cell[
    StyleData["NotebookAssistant`Text"],
@@ -14957,6 +14957,24 @@ Notebook[
       ]
      ])
    }
+  ],
+  Cell[
+   StyleData["TextExpressionLink"],
+   TemplateBoxOptions -> {
+    DisplayFunction ->
+     (Function[
+      ButtonBox[
+       #1,
+       Appearance -> None,
+       BaseStyle -> {"Text", "Hyperlink"},
+       ButtonFunction :>
+        CreateDocument[BinaryDeserialize[BaseDecode[#2]]],
+       DefaultBaseStyle -> { },
+       Evaluator -> Automatic,
+       Method -> "Queued"
+      ]
+     ])
+   }
   ]
  },
  StyleDefinitions -> "PrivateStylesheetFormatting.nb"

diff --git a/FrontEnd/StyleSheets/Wolfram/WorkspaceChat.nb b/FrontEnd/StyleSheets/Wolfram/WorkspaceChat.nb
@@ -83,7 +83,7 @@ Notebook[
   Cell[StyleData["CellExpression"], Selectable -> True],
   Cell[
    StyleData["WorkspaceChatStyleSheetInformation"],
-   TaggingRules -> <|"WorkspaceChatStyleSheetVersion" -> "2.0.8.3943617669"|>
+   TaggingRules -> <|"WorkspaceChatStyleSheetVersion" -> "2.0.15.3945149906"|>
   ],
   Cell[
    StyleData["AttachedCell"],

diff --git a/Source/Chatbook/ChatMessages.wl b/Source/Chatbook/ChatMessages.wl
@@ -989,13 +989,6 @@ $useRasterizationCompatibility := Enclose[
         ]
 ];
 
-(* ::**************************************************************************************************************:: *)
-(* ::Subsubsection::Closed:: *)
-(*expressionURIQ*)
-expressionURIQ // beginDefinition;
-expressionURIQ[ uri_String ] := KeyExistsQ[ $attachments, StringDelete[ uri, StartOfString ~~ __ ~~ "://" ] ];
-expressionURIQ // endDefinition;
-
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsection::Closed:: *)
 (*graphicsURIQ*)

diff --git a/Source/Chatbook/CommonSymbols.wl b/Source/Chatbook/CommonSymbols.wl
@@ -158,6 +158,7 @@ BeginPackage[ "Wolfram`Chatbook`Common`" ];
 `exportDataURI;
 `expressionURIKey;
 `expressionURIKeyQ;
+`expressionURIQ;
 `extractBodyChunks;
 `fakeOpenerView;
 `fastFileHash;

diff --git a/Source/Chatbook/Formatting.wl b/Source/Chatbook/Formatting.wl
@@ -2778,6 +2778,17 @@ $embeddedImageTemplate = "<div style=\"margin: -8px;\"><img src=\"`1`\" width=\"
 (*hyperlink*)
 hyperlink // beginDefinition;
 
+hyperlink[ label_String, uri_String? expressionURIQ ] :=
+    If[ TrueQ @ $dynamicText,
+        StyleBox[ label, "Hyperlink" ],
+        With[ { b = BaseEncode @ BinarySerialize[ GetExpressionURI @ uri, PerformanceGoal -> "Size" ] },
+            Cell[
+                BoxData @ TemplateBox[ { ToBoxes @ label, b }, "TextExpressionLink" ],
+                Background -> None
+            ]
+        ]
+    ];
+
 hyperlink[ label_String | { label_String }, uri_String ] /; StringStartsQ[ uri, "paclet:" ] :=
     Cell @ BoxData @ TemplateBox[
         {

diff --git a/Source/Chatbook/Tools/ExpressionURIs.wl b/Source/Chatbook/Tools/ExpressionURIs.wl
@@ -180,7 +180,7 @@ expressionURIKey // beginDefinition;
 
 expressionURIKey[ str_String ] := expressionURIKey[ str ] = FixedPoint[
     StringDelete @ {
-        StartOfString ~~ "![" ~~ __ ~~ "](",
+        StartOfString ~~ ("!["|"[") ~~ __ ~~ "](",
         StartOfString ~~ LetterCharacter.. ~~ "://",
         ")"~~EndOfString
     },