@storybook/addon-links 6.4.0-beta.2 → 6.4.0-beta.23

package/dist/cjs/preview.js

@@ -21,7 +21,11 @@ require("core-js/modules/es.function.name.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.withLinks = exports.hrefTo = exports.linkTo = exports.navigate = void 0;
+exports.withLinks = exports.linkTo = exports.hrefTo = exports.navigate = void 0;
+
+require("core-js/modules/es.promise.js");
+
+require("core-js/modules/es.object.to-string.js");
 
 require("core-js/modules/es.string.search.js");
 
@@ -29,13 +33,11 @@ require("core-js/modules/es.regexp.exec.js");
 
 require("core-js/modules/es.array.concat.js");
 
-require("core-js/modules/es.object.assign.js");
-
-require("core-js/modules/es.array.find.js");
+require("core-js/modules/es.string.split.js");
 
-require("core-js/modules/es.promise.js");
+require("core-js/modules/es.object.assign.js");
 
-require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/es.string.match.js");
 
 var _global = _interopRequireDefault(require("global"));
 
@@ -47,8 +49,6 @@ var _coreEvents = require("@storybook/core-events");
 
 var _csf = require("@storybook/csf");
 
-var _clientLogger = require("@storybook/client-logger");
-
 var _constants = require("./constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -66,9 +66,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 var document = _global.default.document,
-    HTMLElement = _global.default.HTMLElement,
-    storyStore = _global.default.__STORYBOOK_STORY_STORE__,
-    clientApi = _global.default.__STORYBOOK_CLIENT_API__;
+    HTMLElement = _global.default.HTMLElement;
 
 var navigate = function navigate(params) {
   return _addons.addons.getChannel().emit(_coreEvents.SELECT_STORY, params);
@@ -76,86 +74,59 @@ var navigate = function navigate(params) {
 
 exports.navigate = navigate;
 
-var generateUrl = function generateUrl(id) {
-  var location = document.location;
+var hrefTo = function hrefTo(title, name) {
+  return new Promise(function (resolve) {
+    var location = document.location;
 
-  var query = _qs.default.parse(location.search, {
-    ignoreQueryPrefix: true
-  });
+    var query = _qs.default.parse(location.search, {
+      ignoreQueryPrefix: true
+    });
 
-  return "".concat(location.origin + location.pathname, "?").concat(_qs.default.stringify(Object.assign({}, query, {
-    id: id
-  }), {
-    encode: false
-  }));
+    var existingId = [].concat(query.id)[0];
+    var titleToLink = title || existingId.split('--', 2)[0];
+    var id = (0, _csf.toId)(titleToLink, name);
+    var url = "".concat(location.origin + location.pathname, "?").concat(_qs.default.stringify(Object.assign({}, query, {
+      id: id
+    }), {
+      encode: false
+    }));
+    resolve(url);
+  });
 };
 
+exports.hrefTo = hrefTo;
+
 var valueOrCall = function valueOrCall(args) {
   return function (value) {
     return typeof value === 'function' ? value.apply(void 0, _toConsumableArray(args)) : value;
   };
 };
 
-var linkTo = function linkTo(idOrKindInput, storyInput) {
+var linkTo = function linkTo(idOrTitle, nameInput) {
   return function () {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
 
     var resolver = valueOrCall(args);
+    var title = resolver(idOrTitle);
+    var name = resolver(nameInput);
 
-    var _storyStore$getSelect = storyStore.getSelection(),
-        storyId = _storyStore$getSelect.storyId;
-
-    var current = storyStore.fromId(storyId) || {};
-    var kindVal = resolver(idOrKindInput);
-    var storyVal = resolver(storyInput);
-    var fromid = storyStore.fromId(kindVal);
-    var item = fromid || clientApi.raw().find(function (i) {
-      if (kindVal && storyVal) {
-        return i.kind === kindVal && i.story === storyVal;
-      }
-
-      if (!kindVal && storyVal) {
-        return i.kind === current.kind && i.story === storyVal;
-      }
-
-      if (kindVal && !storyVal) {
-        return i.kind === kindVal;
-      }
-
-      if (!kindVal && !storyVal) {
-        return i.kind === current.kind;
-      }
-
-      return false;
-    });
-
-    if (item) {
+    if (title !== null && title !== void 0 && title.match(/--/) && !name) {
       navigate({
-        kind: item.kind,
-        story: item.story
+        storyId: title
       });
     } else {
-      _clientLogger.logger.error('could not navigate to provided story');
+      navigate({
+        kind: title,
+        story: name
+      });
     }
   };
 };
 
 exports.linkTo = linkTo;
 
-var hrefTo = function hrefTo(kind, name) {
-  return new Promise(function (resolve) {
-    var _storyStore$getSelect2 = storyStore.getSelection(),
-        storyId = _storyStore$getSelect2.storyId;
-
-    var current = storyStore.fromId(storyId);
-    resolve(generateUrl((0, _csf.toId)(kind || current.kind, name)));
-  });
-};
-
-exports.hrefTo = hrefTo;
-
 var linksListener = function linksListener(e) {
   var target = e.target;
 
@@ -196,8 +167,7 @@ var off = function off() {
 var withLinks = (0, _addons.makeDecorator)({
   name: 'withLinks',
   parameterName: _constants.PARAM_KEY,
-  wrapper: function wrapper(getStory, context, _ref) {
-    var parameters = _ref.parameters;
+  wrapper: function wrapper(getStory, context) {
     on();
 
     _addons.addons.getChannel().once(_coreEvents.STORY_CHANGED, off);

package/dist/esm/preview.js

@@ -10,13 +10,14 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+import "core-js/modules/es.promise.js";
+import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/es.string.search.js";
 import "core-js/modules/es.regexp.exec.js";
 import "core-js/modules/es.array.concat.js";
+import "core-js/modules/es.string.split.js";
 import "core-js/modules/es.object.assign.js";
-import "core-js/modules/es.array.find.js";
-import "core-js/modules/es.promise.js";
-import "core-js/modules/es.object.to-string.js";
+import "core-js/modules/es.string.match.js";
 import "core-js/modules/es.symbol.js";
 import "core-js/modules/es.symbol.description.js";
 import "core-js/modules/es.symbol.iterator.js";
@@ -31,26 +32,28 @@ import qs from 'qs';
 import { addons, makeDecorator } from '@storybook/addons';
 import { STORY_CHANGED, SELECT_STORY } from '@storybook/core-events';
 import { toId } from '@storybook/csf';
-import { logger } from '@storybook/client-logger';
 import { PARAM_KEY } from './constants';
 var document = global.document,
-    HTMLElement = global.HTMLElement,
-    storyStore = global.__STORYBOOK_STORY_STORE__,
-    clientApi = global.__STORYBOOK_CLIENT_API__;
+    HTMLElement = global.HTMLElement;
 export var navigate = function navigate(params) {
   return addons.getChannel().emit(SELECT_STORY, params);
 };
-
-var generateUrl = function generateUrl(id) {
-  var location = document.location;
-  var query = qs.parse(location.search, {
-    ignoreQueryPrefix: true
+export var hrefTo = function hrefTo(title, name) {
+  return new Promise(function (resolve) {
+    var location = document.location;
+    var query = qs.parse(location.search, {
+      ignoreQueryPrefix: true
+    });
+    var existingId = [].concat(query.id)[0];
+    var titleToLink = title || existingId.split('--', 2)[0];
+    var id = toId(titleToLink, name);
+    var url = "".concat(location.origin + location.pathname, "?").concat(qs.stringify(Object.assign({}, query, {
+      id: id
+    }), {
+      encode: false
+    }));
+    resolve(url);
   });
-  return "".concat(location.origin + location.pathname, "?").concat(qs.stringify(Object.assign({}, query, {
-    id: id
-  }), {
-    encode: false
-  }));
 };
 
 var valueOrCall = function valueOrCall(args) {
@@ -59,60 +62,28 @@ var valueOrCall = function valueOrCall(args) {
   };
 };
 
-export var linkTo = function linkTo(idOrKindInput, storyInput) {
+export var linkTo = function linkTo(idOrTitle, nameInput) {
   return function () {
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
 
     var resolver = valueOrCall(args);
+    var title = resolver(idOrTitle);
+    var name = resolver(nameInput);
 
-    var _storyStore$getSelect = storyStore.getSelection(),
-        storyId = _storyStore$getSelect.storyId;
-
-    var current = storyStore.fromId(storyId) || {};
-    var kindVal = resolver(idOrKindInput);
-    var storyVal = resolver(storyInput);
-    var fromid = storyStore.fromId(kindVal);
-    var item = fromid || clientApi.raw().find(function (i) {
-      if (kindVal && storyVal) {
-        return i.kind === kindVal && i.story === storyVal;
-      }
-
-      if (!kindVal && storyVal) {
-        return i.kind === current.kind && i.story === storyVal;
-      }
-
-      if (kindVal && !storyVal) {
-        return i.kind === kindVal;
-      }
-
-      if (!kindVal && !storyVal) {
-        return i.kind === current.kind;
-      }
-
-      return false;
-    });
-
-    if (item) {
+    if (title !== null && title !== void 0 && title.match(/--/) && !name) {
       navigate({
-        kind: item.kind,
-        story: item.story
+        storyId: title
       });
     } else {
-      logger.error('could not navigate to provided story');
+      navigate({
+        kind: title,
+        story: name
+      });
     }
   };
 };
-export var hrefTo = function hrefTo(kind, name) {
-  return new Promise(function (resolve) {
-    var _storyStore$getSelect2 = storyStore.getSelection(),
-        storyId = _storyStore$getSelect2.storyId;
-
-    var current = storyStore.fromId(storyId);
-    resolve(generateUrl(toId(kind || current.kind, name)));
-  });
-};
 
 var linksListener = function linksListener(e) {
   var target = e.target;
@@ -154,8 +125,7 @@ var off = function off() {
 export var withLinks = makeDecorator({
   name: 'withLinks',
   parameterName: PARAM_KEY,
-  wrapper: function wrapper(getStory, context, _ref) {
-    var parameters = _ref.parameters;
+  wrapper: function wrapper(getStory, context) {
     on();
     addons.getChannel().once(STORY_CHANGED, off);
     return getStory(context);

package/dist/modern/preview.js

@@ -3,79 +3,50 @@ import qs from 'qs';
 import { addons, makeDecorator } from '@storybook/addons';
 import { STORY_CHANGED, SELECT_STORY } from '@storybook/core-events';
 import { toId } from '@storybook/csf';
-import { logger } from '@storybook/client-logger';
 import { PARAM_KEY } from './constants';
 const {
   document,
-  HTMLElement,
-  __STORYBOOK_STORY_STORE__: storyStore,
-  __STORYBOOK_CLIENT_API__: clientApi
+  HTMLElement
 } = global;
 export const navigate = params => addons.getChannel().emit(SELECT_STORY, params);
-
-const generateUrl = id => {
-  const {
-    location
-  } = document;
-  const query = qs.parse(location.search, {
-    ignoreQueryPrefix: true
+export const hrefTo = (title, name) => {
+  return new Promise(resolve => {
+    const {
+      location
+    } = document;
+    const query = qs.parse(location.search, {
+      ignoreQueryPrefix: true
+    });
+    const existingId = [].concat(query.id)[0];
+    const titleToLink = title || existingId.split('--', 2)[0];
+    const id = toId(titleToLink, name);
+    const url = `${location.origin + location.pathname}?${qs.stringify(Object.assign({}, query, {
+      id
+    }), {
+      encode: false
+    })}`;
+    resolve(url);
   });
-  return `${location.origin + location.pathname}?${qs.stringify(Object.assign({}, query, {
-    id
-  }), {
-    encode: false
-  })}`;
 };
 
 const valueOrCall = args => value => typeof value === 'function' ? value(...args) : value;
 
-export const linkTo = (idOrKindInput, storyInput) => (...args) => {
+export const linkTo = (idOrTitle, nameInput) => (...args) => {
   const resolver = valueOrCall(args);
-  const {
-    storyId
-  } = storyStore.getSelection();
-  const current = storyStore.fromId(storyId) || {};
-  const kindVal = resolver(idOrKindInput);
-  const storyVal = resolver(storyInput);
-  const fromid = storyStore.fromId(kindVal);
-  const item = fromid || clientApi.raw().find(i => {
-    if (kindVal && storyVal) {
-      return i.kind === kindVal && i.story === storyVal;
-    }
-
-    if (!kindVal && storyVal) {
-      return i.kind === current.kind && i.story === storyVal;
-    }
-
-    if (kindVal && !storyVal) {
-      return i.kind === kindVal;
-    }
-
-    if (!kindVal && !storyVal) {
-      return i.kind === current.kind;
-    }
+  const title = resolver(idOrTitle);
+  const name = resolver(nameInput);
 
-    return false;
-  });
-
-  if (item) {
+  if (title !== null && title !== void 0 && title.match(/--/) && !name) {
     navigate({
-      kind: item.kind,
-      story: item.story
+      storyId: title
     });
   } else {
-    logger.error('could not navigate to provided story');
+    navigate({
+      kind: title,
+      story: name
+    });
   }
 };
-export const hrefTo = (kind, name) => {
-  return new Promise(resolve => {
-    const {
-      storyId
-    } = storyStore.getSelection();
-    const current = storyStore.fromId(storyId);
-    resolve(generateUrl(toId(kind || current.kind, name)));
-  });
-};
 
 const linksListener = e => {
   const {
@@ -120,9 +91,7 @@ const off = () => {
 export const withLinks = makeDecorator({
   name: 'withLinks',
   parameterName: PARAM_KEY,
-  wrapper: (getStory, context, {
-    parameters
-  }) => {
+  wrapper: (getStory, context) => {
     on();
     addons.getChannel().once(STORY_CHANGED, off);
     return getStory(context);

package/dist/ts3.4/preview.d.ts

@@ -1,12 +1,13 @@
+import { StoryId, StoryName, ComponentTitle } from '@storybook/csf';
 interface ParamsId {
-    storyId: string;
+    storyId: StoryId;
 }
 interface ParamsCombo {
-    kind: string;
-    story: string;
+    kind?: ComponentTitle;
+    story?: StoryName;
 }
 export declare const navigate: (params: ParamsId | ParamsCombo) => void;
-export declare const linkTo: (idOrKindInput: string, storyInput?: string | ((...args: any[]) => string)) => (...args: any[]) => void;
-export declare const hrefTo: (kind: string, name: string) => Promise<string>;
+export declare const hrefTo: (title: ComponentTitle, name: StoryName) => Promise<string>;
+export declare const linkTo: (idOrTitle: string, nameInput?: string | ((...args: any[]) => string)) => (...args: any[]) => void;
 export declare const withLinks: (...args: any) => any;
 export {};

package/dist/ts3.9/preview.d.ts

@@ -1,12 +1,13 @@
+import { StoryId, StoryName, ComponentTitle } from '@storybook/csf';
 interface ParamsId {
-    storyId: string;
+    storyId: StoryId;
 }
 interface ParamsCombo {
-    kind: string;
-    story: string;
+    kind?: ComponentTitle;
+    story?: StoryName;
 }
 export declare const navigate: (params: ParamsId | ParamsCombo) => void;
-export declare const linkTo: (idOrKindInput: string, storyInput?: string | ((...args: any[]) => string)) => (...args: any[]) => void;
-export declare const hrefTo: (kind: string, name: string) => Promise<string>;
+export declare const hrefTo: (title: ComponentTitle, name: StoryName) => Promise<string>;
+export declare const linkTo: (idOrTitle: string, nameInput?: string | ((...args: any[]) => string)) => (...args: any[]) => void;
 export declare const withLinks: (...args: any) => any;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storybook/addon-links",
-  "version": "6.4.0-beta.2",
+  "version": "6.4.0-beta.23",
   "description": "Link stories together to build demos and prototypes with your UI components",
   "keywords": [
     "addon",
@@ -41,11 +41,11 @@
     "prepare": "node ../../scripts/prepare.js"
   },
   "dependencies": {
-    "@storybook/addons": "6.4.0-beta.2",
-    "@storybook/client-logger": "6.4.0-beta.2",
-    "@storybook/core-events": "6.4.0-beta.2",
-    "@storybook/csf": "0.0.2--canary.6aca495.0",
-    "@storybook/router": "6.4.0-beta.2",
+    "@storybook/addons": "6.4.0-beta.23",
+    "@storybook/client-logger": "6.4.0-beta.23",
+    "@storybook/core-events": "6.4.0-beta.23",
+    "@storybook/csf": "0.0.2--canary.87bc651.0",
+    "@storybook/router": "6.4.0-beta.23",
     "@types/qs": "^6.9.5",
     "core-js": "^3.8.2",
     "global": "^4.4.0",
@@ -72,7 +72,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3358e1e90c4e46dfd28e7ab822d5d20579463186",
+  "gitHead": "34dd760d275faabff6855b84bb64bb69adc1ec1a",
   "sbmodern": "dist/modern/index.js",
   "storybook": {
     "displayName": "Links",