baseui 10.7.2 → 10.9.0

package/timezonepicker/tzdata.js.flow

@@ -0,0 +1,347 @@
+/* eslint-disable header/header */
+// @flow
+
+export const zones = [
+  'Europe/Andorra',
+  'Asia/Dubai',
+  'Asia/Kabul',
+  'Europe/Tirane',
+  'Asia/Yerevan',
+  'Antarctica/Casey',
+  'Antarctica/Davis',
+  'Antarctica/Mawson',
+  'Antarctica/Palmer',
+  'Antarctica/Rothera',
+  'Antarctica/Troll',
+  'Antarctica/Vostok',
+  'America/Argentina/Buenos_Aires',
+  'America/Argentina/Cordoba',
+  'America/Argentina/Salta',
+  'America/Argentina/Jujuy',
+  'America/Argentina/Tucuman',
+  'America/Argentina/Catamarca',
+  'America/Argentina/La_Rioja',
+  'America/Argentina/San_Juan',
+  'America/Argentina/Mendoza',
+  'America/Argentina/San_Luis',
+  'America/Argentina/Rio_Gallegos',
+  'America/Argentina/Ushuaia',
+  'Pacific/Pago_Pago',
+  'Europe/Vienna',
+  'Australia/Lord_Howe',
+  'Antarctica/Macquarie',
+  'Australia/Hobart',
+  'Australia/Melbourne',
+  'Australia/Sydney',
+  'Australia/Broken_Hill',
+  'Australia/Brisbane',
+  'Australia/Lindeman',
+  'Australia/Adelaide',
+  'Australia/Darwin',
+  'Australia/Perth',
+  'Australia/Eucla',
+  'Asia/Baku',
+  'America/Barbados',
+  'Asia/Dhaka',
+  'Europe/Brussels',
+  'Europe/Sofia',
+  'Atlantic/Bermuda',
+  'Asia/Brunei',
+  'America/La_Paz',
+  'America/Noronha',
+  'America/Belem',
+  'America/Fortaleza',
+  'America/Recife',
+  'America/Araguaina',
+  'America/Maceio',
+  'America/Bahia',
+  'America/Sao_Paulo',
+  'America/Campo_Grande',
+  'America/Cuiaba',
+  'America/Santarem',
+  'America/Porto_Velho',
+  'America/Boa_Vista',
+  'America/Manaus',
+  'America/Eirunepe',
+  'America/Rio_Branco',
+  'Asia/Thimphu',
+  'Europe/Minsk',
+  'America/Belize',
+  'America/St_Johns',
+  'America/Halifax',
+  'America/Glace_Bay',
+  'America/Moncton',
+  'America/Goose_Bay',
+  'America/Toronto',
+  'America/Nipigon',
+  'America/Thunder_Bay',
+  'America/Iqaluit',
+  'America/Pangnirtung',
+  'America/Winnipeg',
+  'America/Rainy_River',
+  'America/Resolute',
+  'America/Rankin_Inlet',
+  'America/Regina',
+  'America/Swift_Current',
+  'America/Edmonton',
+  'America/Cambridge_Bay',
+  'America/Yellowknife',
+  'America/Inuvik',
+  'America/Dawson_Creek',
+  'America/Fort_Nelson',
+  'America/Whitehorse',
+  'America/Dawson',
+  'America/Vancouver',
+  'Indian/Cocos',
+  'Europe/Zurich',
+  'Africa/Abidjan',
+  'Pacific/Rarotonga',
+  'America/Santiago',
+  'America/Punta_Arenas',
+  'Pacific/Easter',
+  'Asia/Shanghai',
+  'Asia/Urumqi',
+  'America/Bogota',
+  'America/Costa_Rica',
+  'America/Havana',
+  'Atlantic/Cape_Verde',
+  'Indian/Christmas',
+  'Asia/Nicosia',
+  'Asia/Famagusta',
+  'Europe/Prague',
+  'Europe/Berlin',
+  'Europe/Copenhagen',
+  'America/Santo_Domingo',
+  'Africa/Algiers',
+  'America/Guayaquil',
+  'Pacific/Galapagos',
+  'Europe/Tallinn',
+  'Africa/Cairo',
+  'Africa/El_Aaiun',
+  'Europe/Madrid',
+  'Africa/Ceuta',
+  'Atlantic/Canary',
+  'Europe/Helsinki',
+  'Pacific/Fiji',
+  'Atlantic/Stanley',
+  'Pacific/Chuuk',
+  'Pacific/Pohnpei',
+  'Pacific/Kosrae',
+  'Atlantic/Faroe',
+  'Europe/Paris',
+  'Europe/London',
+  'Asia/Tbilisi',
+  'America/Cayenne',
+  'Europe/Gibraltar',
+  'America/Nuuk',
+  'America/Danmarkshavn',
+  'America/Scoresbysund',
+  'America/Thule',
+  'Europe/Athens',
+  'Atlantic/South_Georgia',
+  'America/Guatemala',
+  'Pacific/Guam',
+  'Africa/Bissau',
+  'America/Guyana',
+  'Asia/Hong_Kong',
+  'America/Tegucigalpa',
+  'America/Port-au-Prince',
+  'Europe/Budapest',
+  'Asia/Jakarta',
+  'Asia/Pontianak',
+  'Asia/Makassar',
+  'Asia/Jayapura',
+  'Europe/Dublin',
+  'Asia/Jerusalem',
+  'Asia/Kolkata',
+  'Indian/Chagos',
+  'Asia/Baghdad',
+  'Asia/Tehran',
+  'Atlantic/Reykjavik',
+  'Europe/Rome',
+  'America/Jamaica',
+  'Asia/Amman',
+  'Asia/Tokyo',
+  'Africa/Nairobi',
+  'Asia/Bishkek',
+  'Pacific/Tarawa',
+  'Pacific/Kanton',
+  'Pacific/Kiritimati',
+  'Asia/Pyongyang',
+  'Asia/Seoul',
+  'Asia/Almaty',
+  'Asia/Qyzylorda',
+  'Asia/Qostanay',
+  'Asia/Aqtobe',
+  'Asia/Aqtau',
+  'Asia/Atyrau',
+  'Asia/Oral',
+  'Asia/Beirut',
+  'Asia/Colombo',
+  'Africa/Monrovia',
+  'Europe/Vilnius',
+  'Europe/Luxembourg',
+  'Europe/Riga',
+  'Africa/Tripoli',
+  'Africa/Casablanca',
+  'Europe/Monaco',
+  'Europe/Chisinau',
+  'Pacific/Majuro',
+  'Pacific/Kwajalein',
+  'Asia/Yangon',
+  'Asia/Ulaanbaatar',
+  'Asia/Hovd',
+  'Asia/Choibalsan',
+  'Asia/Macau',
+  'America/Martinique',
+  'Europe/Malta',
+  'Indian/Mauritius',
+  'Indian/Maldives',
+  'America/Mexico_City',
+  'America/Cancun',
+  'America/Merida',
+  'America/Monterrey',
+  'America/Matamoros',
+  'America/Mazatlan',
+  'America/Chihuahua',
+  'America/Ojinaga',
+  'America/Hermosillo',
+  'America/Tijuana',
+  'America/Bahia_Banderas',
+  'Asia/Kuala_Lumpur',
+  'Asia/Kuching',
+  'Africa/Maputo',
+  'Africa/Windhoek',
+  'Pacific/Noumea',
+  'Pacific/Norfolk',
+  'Africa/Lagos',
+  'America/Managua',
+  'Europe/Amsterdam',
+  'Europe/Oslo',
+  'Asia/Kathmandu',
+  'Pacific/Nauru',
+  'Pacific/Niue',
+  'Pacific/Auckland',
+  'Pacific/Chatham',
+  'America/Panama',
+  'America/Lima',
+  'Pacific/Tahiti',
+  'Pacific/Marquesas',
+  'Pacific/Gambier',
+  'Pacific/Port_Moresby',
+  'Pacific/Bougainville',
+  'Asia/Manila',
+  'Asia/Karachi',
+  'Europe/Warsaw',
+  'America/Miquelon',
+  'Pacific/Pitcairn',
+  'America/Puerto_Rico',
+  'Asia/Gaza',
+  'Asia/Hebron',
+  'Europe/Lisbon',
+  'Atlantic/Madeira',
+  'Atlantic/Azores',
+  'Pacific/Palau',
+  'America/Asuncion',
+  'Asia/Qatar',
+  'Indian/Reunion',
+  'Europe/Bucharest',
+  'Europe/Belgrade',
+  'Europe/Kaliningrad',
+  'Europe/Moscow',
+  'Europe/Simferopol',
+  'Europe/Kirov',
+  'Europe/Volgograd',
+  'Europe/Astrakhan',
+  'Europe/Saratov',
+  'Europe/Ulyanovsk',
+  'Europe/Samara',
+  'Asia/Yekaterinburg',
+  'Asia/Omsk',
+  'Asia/Novosibirsk',
+  'Asia/Barnaul',
+  'Asia/Tomsk',
+  'Asia/Novokuznetsk',
+  'Asia/Krasnoyarsk',
+  'Asia/Irkutsk',
+  'Asia/Chita',
+  'Asia/Yakutsk',
+  'Asia/Khandyga',
+  'Asia/Vladivostok',
+  'Asia/Ust-Nera',
+  'Asia/Magadan',
+  'Asia/Sakhalin',
+  'Asia/Srednekolymsk',
+  'Asia/Kamchatka',
+  'Asia/Anadyr',
+  'Asia/Riyadh',
+  'Pacific/Guadalcanal',
+  'Indian/Mahe',
+  'Africa/Khartoum',
+  'Europe/Stockholm',
+  'Asia/Singapore',
+  'America/Paramaribo',
+  'Africa/Juba',
+  'Africa/Sao_Tome',
+  'America/El_Salvador',
+  'Asia/Damascus',
+  'America/Grand_Turk',
+  'Africa/Ndjamena',
+  'Indian/Kerguelen',
+  'Asia/Bangkok',
+  'Asia/Dushanbe',
+  'Pacific/Fakaofo',
+  'Asia/Dili',
+  'Asia/Ashgabat',
+  'Africa/Tunis',
+  'Pacific/Tongatapu',
+  'Europe/Istanbul',
+  'Pacific/Funafuti',
+  'Asia/Taipei',
+  'Europe/Kiev',
+  'Europe/Uzhgorod',
+  'Europe/Zaporozhye',
+  'Pacific/Wake',
+  'America/New_York',
+  'America/Detroit',
+  'America/Kentucky/Louisville',
+  'America/Kentucky/Monticello',
+  'America/Indiana/Indianapolis',
+  'America/Indiana/Vincennes',
+  'America/Indiana/Winamac',
+  'America/Indiana/Marengo',
+  'America/Indiana/Petersburg',
+  'America/Indiana/Vevay',
+  'America/Chicago',
+  'America/Indiana/Tell_City',
+  'America/Indiana/Knox',
+  'America/Menominee',
+  'America/North_Dakota/Center',
+  'America/North_Dakota/New_Salem',
+  'America/North_Dakota/Beulah',
+  'America/Denver',
+  'America/Boise',
+  'America/Phoenix',
+  'America/Los_Angeles',
+  'America/Anchorage',
+  'America/Juneau',
+  'America/Sitka',
+  'America/Metlakatla',
+  'America/Yakutat',
+  'America/Nome',
+  'America/Adak',
+  'Pacific/Honolulu',
+  'America/Montevideo',
+  'Asia/Samarkand',
+  'Asia/Tashkent',
+  'America/Caracas',
+  'Asia/Ho_Chi_Minh',
+  'Pacific/Efate',
+  'Pacific/Wallis',
+  'Pacific/Apia',
+  'Africa/Johannesburg',
+];
+
+declare var __DEV__: boolean;
+declare var __NODE__: boolean;
+declare var __BROWSER__: boolean;

package/timezonepicker/update-tzdata.js

@@ -0,0 +1,164 @@
+"use strict";
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+/*
+Copyright (c) Uber Technologies, Inc.
+
+This source code is licensed under the MIT license found in the
+LICENSE file in the root directory of this source tree.
+*/
+
+/* eslint-env node */
+var fs = require('fs');
+
+var path = require('path');
+
+var util = require('util');
+
+var exec = util.promisify(require('child_process').exec); // Download tzdata and collect a list of timezones. Baseui previously used a library
+// to do this, but it grew stale and unmaintained. This approach is straightforward
+// enough to update whenever necessary, but future improvements could include building
+// this data set before baseui is published so that the data is always fresh.
+
+function main() {
+  return _main.apply(this, arguments);
+}
+
+function _main() {
+  _main = _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+    var tmpDir, src, zoneTabPath, content, lines, zones, _iterator, _step, line, parts, file, _i, _zones, zone, tzdataPath;
+
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            tmpDir = path.join(__dirname, 'tmp'); // $FlowFixMe - flow is not aware of recursive option
+
+            _context.next = 4;
+            return fs.promises.rmdir(tmpDir, {
+              recursive: true
+            });
+
+          case 4:
+            _context.next = 6;
+            return fs.promises.mkdir(tmpDir);
+
+          case 6:
+            src = "https://www.iana.org/time-zones/repository/tzdata-latest.tar.gz";
+            _context.next = 9;
+            return exec("curl -L ".concat(src, " | gzip -dc | tar -xf - --directory ").concat(tmpDir));
+
+          case 9:
+            zoneTabPath = path.join(tmpDir, 'zone1970.tab');
+            _context.next = 12;
+            return fs.promises.readFile(zoneTabPath, 'utf-8');
+
+          case 12:
+            content = _context.sent;
+            lines = content.split('\n');
+            zones = [];
+            _iterator = _createForOfIteratorHelper(lines);
+            _context.prev = 16;
+
+            _iterator.s();
+
+          case 18:
+            if ((_step = _iterator.n()).done) {
+              _context.next = 26;
+              break;
+            }
+
+            line = _step.value;
+
+            if (!(line[0] === '#')) {
+              _context.next = 22;
+              break;
+            }
+
+            return _context.abrupt("continue", 24);
+
+          case 22:
+            parts = line.split(/\s+/);
+
+            if (parts.length >= 3) {
+              zones.push(parts[2]);
+            }
+
+          case 24:
+            _context.next = 18;
+            break;
+
+          case 26:
+            _context.next = 31;
+            break;
+
+          case 28:
+            _context.prev = 28;
+            _context.t0 = _context["catch"](16);
+
+            _iterator.e(_context.t0);
+
+          case 31:
+            _context.prev = 31;
+
+            _iterator.f();
+
+            return _context.finish(31);
+
+          case 34:
+            file = [];
+            file.push('/* eslint-disable header/header */');
+            file.push('// @flow');
+            file.push('');
+            file.push('export const zones = [');
+
+            for (_i = 0, _zones = zones; _i < _zones.length; _i++) {
+              zone = _zones[_i];
+              file.push("  '".concat(zone, "',"));
+            }
+
+            file.push('];');
+            tzdataPath = path.join(__dirname, 'tzdata.js');
+            _context.next = 44;
+            return fs.promises.writeFile(tzdataPath, file.join('\n'));
+
+          case 44:
+            _context.next = 46;
+            return fs.promises.rmdir(tmpDir, {
+              recursive: true
+            });
+
+          case 46:
+            _context.next = 51;
+            break;
+
+          case 48:
+            _context.prev = 48;
+            _context.t1 = _context["catch"](0);
+            console.error(_context.t1);
+
+          case 51:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[0, 48], [16, 28, 31, 34]]);
+  }));
+  return _main.apply(this, arguments);
+}
+
+main();

package/timezonepicker/update-tzdata.js.flow

@@ -0,0 +1,70 @@
+/*
+Copyright (c) Uber Technologies, Inc.
+
+This source code is licensed under the MIT license found in the
+LICENSE file in the root directory of this source tree.
+*/
+/* eslint-env node */
+// @flow
+
+const fs = require('fs');
+const path = require('path');
+const util = require('util');
+
+const exec = util.promisify(require('child_process').exec);
+
+// Download tzdata and collect a list of timezones. Baseui previously used a library
+// to do this, but it grew stale and unmaintained. This approach is straightforward
+// enough to update whenever necessary, but future improvements could include building
+// this data set before baseui is published so that the data is always fresh.
+async function main() {
+  try {
+    const tmpDir = path.join(__dirname, 'tmp');
+    // $FlowFixMe - flow is not aware of recursive option
+    await fs.promises.rmdir(tmpDir, {recursive: true});
+    await fs.promises.mkdir(tmpDir);
+
+    const src = `https://www.iana.org/time-zones/repository/tzdata-latest.tar.gz`;
+    await exec(`curl -L ${src} | gzip -dc | tar -xf - --directory ${tmpDir}`);
+
+    const zoneTabPath = path.join(tmpDir, 'zone1970.tab');
+    const content = await fs.promises.readFile(zoneTabPath, 'utf-8');
+    const lines = content.split('\n');
+
+    const zones = [];
+    for (const line of lines) {
+      if (line[0] === '#') {
+        continue;
+      }
+
+      const parts = line.split(/\s+/);
+      if (parts.length >= 3) {
+        zones.push(parts[2]);
+      }
+    }
+
+    const file = [];
+    file.push('/* eslint-disable header/header */');
+    file.push('// @flow');
+    file.push('');
+    file.push('export const zones = [');
+    for (const zone of zones) {
+      file.push(`  '${zone}',`);
+    }
+    file.push('];');
+
+    const tzdataPath = path.join(__dirname, 'tzdata.js');
+    await fs.promises.writeFile(tzdataPath, file.join('\n'));
+
+    // $FlowFixMe - flow is not aware of recursive option
+    await fs.promises.rmdir(tmpDir, {recursive: true});
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+main();
+
+declare var __DEV__: boolean;
+declare var __NODE__: boolean;
+declare var __BROWSER__: boolean;

package/toast/styled-components.js

@@ -25,10 +25,18 @@ function getBackgroundColor(kind, type, theme) {
   return (_KIND$info$KIND$posit = {}, _defineProperty(_KIND$info$KIND$posit, _constants.KIND.info, isInline ? theme.colors.notificationInfoBackground : theme.colors.toastInfoBackground), _defineProperty(_KIND$info$KIND$posit, _constants.KIND.positive, isInline ? theme.colors.notificationPositiveBackground : theme.colors.toastPositiveBackground), _defineProperty(_KIND$info$KIND$posit, _constants.KIND.warning, isInline ? theme.colors.notificationWarningBackground : theme.colors.toastWarningBackground), _defineProperty(_KIND$info$KIND$posit, _constants.KIND.negative, isInline ? theme.colors.notificationNegativeBackground : theme.colors.toastNegativeBackground), _KIND$info$KIND$posit)[kind];
 }
 
-function getFontColor(kind, theme) {
-  var _KIND$info$KIND$posit2;
+function getFontColor(kind, type, theme) {
+  var _KIND$info$KIND$posit3;
 
-  return (_KIND$info$KIND$posit2 = {}, _defineProperty(_KIND$info$KIND$posit2, _constants.KIND.info, theme.colors.notificationInfoText), _defineProperty(_KIND$info$KIND$posit2, _constants.KIND.positive, theme.colors.notificationPositiveText), _defineProperty(_KIND$info$KIND$posit2, _constants.KIND.warning, theme.colors.notificationWarningText), _defineProperty(_KIND$info$KIND$posit2, _constants.KIND.negative, theme.colors.notificationNegativeText), _KIND$info$KIND$posit2)[kind];
+  var isInline = type === _constants.TYPE.inline;
+
+  if (isInline) {
+    var _KIND$info$KIND$posit2;
+
+    return (_KIND$info$KIND$posit2 = {}, _defineProperty(_KIND$info$KIND$posit2, _constants.KIND.info, theme.colors.notificationInfoText), _defineProperty(_KIND$info$KIND$posit2, _constants.KIND.positive, theme.colors.notificationPositiveText), _defineProperty(_KIND$info$KIND$posit2, _constants.KIND.warning, theme.colors.notificationWarningText), _defineProperty(_KIND$info$KIND$posit2, _constants.KIND.negative, theme.colors.notificationNegativeText), _KIND$info$KIND$posit2)[kind];
+  }
+
+  return (_KIND$info$KIND$posit3 = {}, _defineProperty(_KIND$info$KIND$posit3, _constants.KIND.info, theme.colors.toastInfoText), _defineProperty(_KIND$info$KIND$posit3, _constants.KIND.positive, theme.colors.toastPositiveText), _defineProperty(_KIND$info$KIND$posit3, _constants.KIND.warning, theme.colors.toastWarningText), _defineProperty(_KIND$info$KIND$posit3, _constants.KIND.negative, theme.colors.toastNegativeText), _KIND$info$KIND$posit3)[kind];
 }
 
 function getPlacement(placement) {
@@ -96,9 +104,9 @@ var Body = (0, _index.styled)('div', function (props) {
       $type = props.$type,
       $theme = props.$theme;
   var isInline = $type === _constants.TYPE.inline;
-  return _objectSpread(_objectSpread({}, $theme.typography.font250), {}, {
+  return _objectSpread(_objectSpread({}, $theme.typography.font300), {}, {
     pointerEvents: 'auto',
-    color: isInline ? getFontColor($kind, $theme) : $theme.colors.toastText,
+    color: getFontColor($kind, $type, $theme),
     height: 'auto',
     width: '288px',
     paddingTop: $theme.sizing.scale600,

package/toast/styled-components.js.flow

@@ -40,12 +40,22 @@ function getBackgroundColor(
   }[kind];
 }
 
-function getFontColor(kind: KindTypeT, theme: ThemeT) {
+function getFontColor(kind: KindTypeT, type: NotificationTypeT, theme: ThemeT) {
+  const isInline = type === TYPE.inline;
+  if (isInline) {
+    return {
+      [KIND.info]: theme.colors.notificationInfoText,
+      [KIND.positive]: theme.colors.notificationPositiveText,
+      [KIND.warning]: theme.colors.notificationWarningText,
+      [KIND.negative]: theme.colors.notificationNegativeText,
+    }[kind];
+  }
+
   return {
-    [KIND.info]: theme.colors.notificationInfoText,
-    [KIND.positive]: theme.colors.notificationPositiveText,
-    [KIND.warning]: theme.colors.notificationWarningText,
-    [KIND.negative]: theme.colors.notificationNegativeText,
+    [KIND.info]: theme.colors.toastInfoText,
+    [KIND.positive]: theme.colors.toastPositiveText,
+    [KIND.warning]: theme.colors.toastWarningText,
+    [KIND.negative]: theme.colors.toastNegativeText,
   }[kind];
 }
 
@@ -115,9 +125,9 @@ export const Body = styled<SharedStylePropsArgT>('div', props => {
   const {$isVisible, $kind, $type, $theme} = props;
   const isInline = $type === TYPE.inline;
   return {
-    ...$theme.typography.font250,
+    ...$theme.typography.font300,
     pointerEvents: 'auto',
-    color: isInline ? getFontColor($kind, $theme) : $theme.colors.toastText,
+    color: getFontColor($kind, $type, $theme),
     height: 'auto',
     width: '288px',
     paddingTop: $theme.sizing.scale600,