playbook_ui 13.32.0 → 13.33.0.pre.alpha.PLAY1454formpillicons3309

data/app/pb_kits/playbook/pb_icon/_icon.tsx

@@ -3,7 +3,6 @@ import classnames from 'classnames'
 import { buildAriaProps, buildDataProps, buildHtmlProps } from '../utilities/props'
 import { GlobalProps, globalProps } from '../utilities/globalProps'
 import { isValidEmoji } from '../utilities/validEmojiChecker'
-import aliasesJson from './icon_aliases.json'
 
 export type IconSizes = "lg"
 | "xs"
@@ -41,24 +40,75 @@ type IconProps = {
   spin?: boolean,
 } & GlobalProps
 
-type AliasType = string | string[];
-
-interface Aliases {
-  [key: string]: AliasType;
+const flipMap = {
+  fa: {
+    horizontal: 'fa-flip-horizontal',
+    vertical: 'fa-flip-vertical',
+    both: 'fa-flip-horizontal fa-flip-vertical',
+    none: ''
+  },
+  svg: {
+    horizontal: 'flip_horizontal',
+    vertical: 'flip_vertical',
+    both: 'flip_horizontal flip_vertical',
+    none: ''
+  }
 }
-
-interface AliasesJson {
-  aliases: Aliases;
+const pulseMap = {
+  fa: 'fa-pulse',
+  svg: 'pulse'
+}
+const spinMap = {
+  fa: 'fa-spin',
+  svg: 'spin'
+}
+const rotateMap = {
+  fa: {
+    90: 'fa-rotate-90',
+    180: 'fa-rotate-180',
+    270: 'fa-rotate-270'
+  },
+  svg: {
+    90: 'rotate_90',
+    180: 'rotate_180',
+    270: 'rotate_270'
+  }
 }
 
-const aliases: AliasesJson = aliasesJson;
-
+const sizeMap = {
+  fa: {
+    "lg": "fa-lg",
+    "xs": "fa-xs",
+    "sm": "fa-sm",
+    "1x": "fa-1x",
+    "2x": "fa-2x",
+    "3x": "fa-3x",
+    "4x": "fa-4x",
+    "5x": "fa-5x",
+    "6x": "fa-6x",
+    "7x": "fa-7x",
+    "8x": "fa-8x",
+    "9x": "fa-9x",
+    "10x": "fa-10x",
+    "": ""
+  },
+  svg: {
+    "lg": "svg_lg",
+    "xs": "svg_xs",
+    "sm": "svg_sm",
+    "1x": "svg_1x",
+    "2x": "svg_2x",
+    "3x": "svg_3x",
+    "4x": "svg_4x",
+    "5x": "svg_5x",
+    "6x": "svg_6x",
+    "7x": "svg_7x",
+    "8x": "svg_8x",
+    "9x": "svg_9x",
+    "10x": "svg_10x",
+    "": ""
+  }
 
-const flipMap = {
-  horizontal: 'fa-flip-horizontal',
-  vertical: 'fa-flip-vertical',
-  both: 'fa-flip-horizontal fa-flip-vertical',
-  none: ""
 }
 
 declare global {
@@ -66,22 +116,6 @@ declare global {
   var PB_ICONS: {[key: string]: React.FunctionComponent<any>}
 }
 
-// Resolve alias function
-const resolveAlias = (icon: string): string => {
-  const alias = aliases.aliases[icon];
-
-  if (alias) {
-    if (Array.isArray(alias)) {
-      return alias[0];
-    } else {
-      return alias;
-    }
-  }
-
-  return icon;
-};
-
-
 const Icon = (props: IconProps) => {
   const {
     aria = {},
@@ -104,8 +138,7 @@ const Icon = (props: IconProps) => {
     spin = false,
   } = props
 
-  const resolvedIcon = resolveAlias(icon as string)
-  let iconElement: ReactSVGElement | null = typeof(resolvedIcon) === "object" ? resolvedIcon : null
+  let iconElement: ReactSVGElement | null = typeof(icon) === "object" ? icon : null
 
   const faClasses = {
     'fa-border': border,
@@ -121,32 +154,58 @@ const Icon = (props: IconProps) => {
 
   if (!customIcon && !iconElement) {
     const PowerIcon: React.FunctionComponent<any> | undefined =
-      window.PB_ICONS ? window.PB_ICONS[resolvedIcon as string] : null
+      window.PB_ICONS ? window.PB_ICONS[icon as string] : null
 
     if (PowerIcon) {
       iconElement = <PowerIcon /> as ReactSVGElement
     } else {
-      faClasses[`fa-${resolvedIcon}`] = resolvedIcon as string
+      faClasses[`fa-${icon}`] = icon as string
     }
   }
 
-  const classes = classnames(
-    flipMap[flip],
+  const isFA = !iconElement && !customIcon 
+
+  let classes = classnames(
     (!iconElement && !customIcon) ? 'pb_icon_kit' : '',
     (iconElement || customIcon) ? 'pb_custom_icon' : fontStyle,
     iconElement ? 'svg-inline--fa' : '',
-    faClasses,
     globalProps(props),
     className
   )
 
+  const transformClasses = classnames(
+    flip ? flipMap[isFA ? 'fa' : 'svg'][flip] : null,
+    pulse ? pulseMap[isFA ? 'fa' : 'svg'] : null,
+    rotation ? rotateMap[isFA ? 'fa' : 'svg'][rotation] : null,
+    spin ? spinMap[isFA ? 'fa' : 'svg'] : null,
+    size ? sizeMap[isFA ? 'fa' : 'svg'][size] : null,
+    border ? isFA ? 'fa-border' : 'svg_border' : null,
+    fixedWidth ? isFA ? 'fa-fw' : 'svg_fw' : null,
+    inverse ? isFA ? 'fa-inverse' : 'svg_inverse' : null,
+    listItem ? isFA ? 'fa-li' : 'svg_li' : null,
+    pull ? isFA ? `fa-pull-${pull}` : `pull_${pull}` : null,
+  )
+  classes += ` ${transformClasses}`
+
+  if (isFA) {
+    const faClassList = {
+      'fa-border': border,
+      'fa-inverse': inverse,
+      'fa-li': listItem,
+      [`fa-${size}`]: size,
+      [`fa-pull-${pull}`]: pull,
+    }
+    faClassList[`fa-${icon}`] = icon as string
+    classes += ` ${classnames(faClassList)}`
+  }
+
   const classesEmoji = classnames(
     'pb_icon_kit_emoji',
     globalProps(props),
     className
   )
 
-  aria.label ? null : aria.label = `${resolvedIcon} icon`
+  aria.label ? null : aria.label = `${icon} icon`
   const ariaProps: {[key: string]: any} = buildAriaProps(aria)
   const dataProps: {[key: string]: any} = buildDataProps(data)
   const htmlProps = buildHtmlProps(htmlOptions)
@@ -168,7 +227,7 @@ const Icon = (props: IconProps) => {
           }
         </>
       )
-    else if (isValidEmoji(resolvedIcon as string))
+    else if (isValidEmoji(icon as string))
       return (
         <>
           <span
@@ -177,7 +236,7 @@ const Icon = (props: IconProps) => {
               className={classesEmoji}
               id={id}
           >
-            {resolvedIcon}
+            {icon}
           </span>
         </>
       )

data/app/pb_kits/playbook/pb_icon/icon.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/HashLikeCase
-
 require "open-uri"
 require "json"
 
@@ -39,8 +37,6 @@ module Playbook
       prop :spin, type: Playbook::Props::Boolean,
                   default: false
 
-      ALIASES = JSON.parse(File.read(Playbook::Engine.root.join("app/pb_kits/playbook/pb_icon/icon_aliases.json")))["aliases"].freeze
-
       def valid_emoji?
         emoji_regex = /\p{Emoji}/
         emoji_regex.match?(icon)
@@ -82,6 +78,14 @@ module Playbook
         )
       end
 
+      def icon_alias_map
+        return unless Rails.application.config.respond_to?(:icon_alias_path)
+
+        base_path = Rails.application.config.icon_alias_path
+        json = File.read(Rails.root.join(base_path))
+        JSON.parse(json)["aliases"].freeze
+      end
+
       def asset_path
         return unless Rails.application.config.respond_to?(:icon_path)
 
@@ -111,7 +115,9 @@ module Playbook
     private
 
       def resolve_alias(icon)
-        aliases = ALIASES[icon]
+        return icon unless icon_alias_map
+
+        aliases = icon_alias_map[icon]
         return icon unless aliases
 
         if aliases.is_a?(Array)
@@ -131,11 +137,13 @@ module Playbook
       end
 
       def border_class
-        border ? "fa-border" : nil
+        prefix = is_svg? ? "svg_border" : "fa-border"
+        border ? prefix : nil
       end
 
       def fixed_width_class
-        fixed_width ? "fa-fw" : nil
+        prefix = is_svg? ? "svg_fw" : "fa-fw"
+        fixed_width ? prefix : nil
       end
 
       def icon_class
@@ -143,38 +151,45 @@ module Playbook
       end
 
       def inverse_class
-        inverse ? "fa-inverse" : nil
+        class_name = is_svg? ? "svg_inverse" : "fa-inverse"
+        inverse ? class_name : nil
       end
 
       def list_item_class
-        list_item ? "fa-li" : nil
+        class_name = is_svg? ? "svg_li" : "fa-li"
+        list_item ? class_name : nil
       end
 
       def flip_class
+        prefix = is_svg? ? "flip_" : "fa-flip-"
         case flip
         when "horizontal"
-          "fa-flip-horizontal"
+          "#{prefix}horizontal"
         when "vertical"
-          "fa-flip-vertical"
+          "#{prefix}vertical"
         when "both"
-          "fa-flip-horizontal fa-flip-vertical"
+          "#{prefix}horizontal #{prefix}vertical"
         end
       end
 
       def pull_class
-        pull ? "fa-pull-#{pull}" : nil
+        class_name = is_svg? ? "pull_#{pull}" : "fa-pull-#{pull}"
+        pull ? class_name : nil
       end
 
       def pulse_class
-        pulse ? "fa-pulse" : nil
+        class_name = is_svg? ? "pulse" : "fa-pulse"
+        pulse ? class_name : nil
       end
 
       def rotation_class
-        rotation ? "fa-rotate-#{rotation}" : nil
+        class_name = is_svg? ? "rotate_#{rotation}" : "fa-rotate-#{rotation}"
+        rotation ? class_name : nil
       end
 
       def size_class
-        size ? "fa-#{size}" : nil
+        class_name = is_svg? ? "svg_#{size}" : "fa-#{size}"
+        size ? class_name : nil
       end
 
       def font_style_class
@@ -182,10 +197,9 @@ module Playbook
       end
 
       def spin_class
-        spin ? "fa-spin" : nil
+        class_name = is_svg? ? "spin" : "fa-spin"
+        spin ? class_name : nil
       end
     end
   end
 end
-
-# rubocop:enable Style/HashLikeCase

data/app/pb_kits/playbook/pb_nav/_nav_item.test.js

@@ -95,11 +95,11 @@ test('should not have a left border', () => {
 test('should have a right icon', () => {
     render(<NavDefault iconRight="angle-down" />)
     const kit = screen.getByTestId(itemTestId)
-    expect(kit).toContainHTML('<i class="pb_icon_kit far fa-fw fa-angle-down pb_nav_list_item_icon_right" />')
+    expect(kit).toContainHTML('<i class="pb_icon_kit far pb_nav_list_item_icon_right fa-fw fa-angle-down" />')
 })
 
 test('should have a left icon', () => {
     render(<NavDefault iconLeft="users-class" />)
     const kit = screen.getByTestId(itemTestId)
-    expect(kit).toContainHTML('<i class="pb_icon_kit far fa-fw fa-users-class pb_nav_list_item_icon_left" />')
+    expect(kit).toContainHTML('<i class="pb_icon_kit far pb_nav_list_item_icon_left fa-fw fa-users-class" />')
 })

data/app/pb_kits/playbook/pb_nav/docs/_tab_nav.html.erb

@@ -0,0 +1,48 @@
+<%= pb_rails("nav", props: { orientation: "horizontal", tabbing: true, padding_bottom: "sm" }) do %>
+  <%= pb_rails("nav/item", props: { text: "About", active: true, data: { pb_tab_target: "about" }, cursor: "pointer" }) %>
+  <%= pb_rails("nav/item", props: { text: "Case Studies", data: { pb_tab_target: "case_studies" }, cursor: "pointer" }) %>
+  <%= pb_rails("nav/item", props: { text: "Service", data: { pb_tab_target: "service" }, cursor: "pointer" }) %>
+  <%= pb_rails("nav/item", props: { text: "Contacts", data: { pb_tab_target: "contacts" }, cursor: "pointer" }) %>
+<% end %>
+
+<div id="about">
+  <%= pb_rails("body", props: { text: "This is about!" }) %>
+</div>
+
+<div id="case_studies">
+  <%= pb_rails("body", props: { text: "This is case studies!" }) %>
+</div>
+
+<div id="service">
+  <%= pb_rails("body", props: { text: "This is service!" }) %>
+</div>
+
+<div id="contacts">
+  <%= pb_rails("body", props: { text: "This is contacts!" }) %>
+</div>
+
+<script>
+  // The script in the code snippet below is for demonstrating the active state and NOT needed for the kit to function.
+  // The active prop can be used to highlight this active state.
+  const navItemClass = "pb_nav_list_kit_item"
+  const navItemActiveClass = "pb_nav_list_kit_item_active"
+  const dataNavItems = "[data-pb-tab-target]"
+
+  const navItemTabs = document.querySelectorAll(dataNavItems)
+  navItemTabs.forEach(navItemTab => {
+    navItemTab.addEventListener("click", event => {
+      const navItemTabs = document.querySelectorAll(dataNavItems)
+      navItemTabs.forEach(navItemTab => {
+        if (navItemTab === event.target.closest(dataNavItems)) {
+          navItemTab.classList.add(navItemActiveClass)
+          navItemTab.classList.remove(navItemClass)
+        } else {
+          if (navItemTab.classList.contains(navItemActiveClass)) {
+            navItemTab.classList.remove(navItemActiveClass)
+            navItemTab.classList.add(navItemClass)
+          }
+        }
+      })
+    })
+  })
+</script>

data/app/pb_kits/playbook/pb_nav/docs/_tab_nav.md

@@ -0,0 +1,3 @@
+The Nav kit can also be used to create dynamic tabbing. To do so, use the boolean `tabbing` prop as shown here. 
+
+All divs you want to use as tabs MUST have an id attached to them. To link the tab to the nav, use the required data attribute `pb_tab_target` on each nav/item and pass it the id of the tab you want linked to that specific nav/item. See code example below to see this in action.

data/app/pb_kits/playbook/pb_nav/docs/example.yml

@@ -19,6 +19,7 @@ examples:
   - block_nav: Block
   - block_no_title_nav: Without Title
   - new_tab: Open in a New Tab
+  - tab_nav: Tab Nav
 
   react:
   - default_nav: Default

data/app/pb_kits/playbook/pb_nav/index.js

@@ -0,0 +1,43 @@
+import PbEnhancedElement from '../pb_enhanced_element'
+
+const NAV_SELECTOR = '[data-pb-nav-tab]'
+const NAV_ITEM_SELECTOR = '[data-pb-tab-target]'
+
+export default class PbNav extends PbEnhancedElement {
+    static get selector() {
+        return NAV_SELECTOR
+    }
+
+    connect() {
+        this.hideAndAddEventListeners()
+    }
+
+    hideAndAddEventListeners() {
+        const navItems = this.element.querySelectorAll(NAV_ITEM_SELECTOR)
+        navItems.forEach((navItem) => {
+            if (!navItem.className.includes('active')) {
+                this.changeContentDisplay(navItem.dataset.pbTabTarget, 'none')
+            }
+
+            navItem.addEventListener('click', event => this.handleNavItemClick(event))
+        })
+    }
+
+    handleNavItemClick(event) {
+        event.preventDefault()
+        const navItem = event.target.closest(NAV_ITEM_SELECTOR)
+        this.changeContentDisplay(navItem.dataset.pbTabTarget, 'block')
+
+        const navItems = this.element.querySelectorAll(NAV_ITEM_SELECTOR)
+        navItems.forEach((navItemSelected) => {
+            if (navItem !== navItemSelected) {
+                this.changeContentDisplay(navItemSelected.dataset.pbTabTarget, 'none')
+            }
+        })
+    }
+
+    changeContentDisplay(contentId, display) {
+        const content = document.getElementById(contentId)
+        content.style.display = display
+    }
+}

data/app/pb_kits/playbook/pb_nav/nav.rb

@@ -13,11 +13,20 @@ module Playbook
                      default: "normal"
       prop :highlight, type: Playbook::Props::Boolean, default: true
       prop :borderless, type: Playbook::Props::Boolean, default: false
+      prop :tabbing, type: Playbook::Props::Boolean, default: false
 
       def classname
         generate_classname("pb_nav_list", variant, orientation, highlight_class, borderless_class)
       end
 
+      def data
+        if tabbing
+          Hash(prop(:data)).merge(pb_nav_tab: true)
+        else
+          prop(:data)
+        end
+      end
+
       def highlight_class
         highlight ? "highlight" : nil
       end

data/app/pb_kits/playbook/pb_rich_text_editor/TipTap/MoreExtensionsDropdown.tsx

@@ -10,7 +10,7 @@ const MoreExtensionsDropdown = ({extensions}: any) => {
   const [showPopover, setShowPopover] = useState(false)
 
   const handleTogglePopover = () => {
-    setShowPopover(true)
+    setShowPopover(!showPopover)
   }
 
   const handlePopoverClose = (shouldClosePopover: boolean) => {

data/app/pb_kits/playbook/pb_rich_text_editor/TipTap/ToolbarDropdown.tsx

@@ -67,7 +67,7 @@ const toolbarDropdownItems = [
 
 
   const handleTogglePopover = () => {
-    setShowPopover(true)
+    setShowPopover(!showPopover)
   }
 
   const handlePopoverClose = (shouldClosePopover: boolean) => {

data/app/pb_kits/playbook/pb_star_rating/_star_rating.scss

@@ -48,8 +48,8 @@
 
 
   $star-styles: (
-    yellow_star: (color: #F9BB00),
-    primary_star: (color: #0056CF),
+    yellow_star: (color: $yellow),
+    primary_star: (color: $royal),
     suble_star_light: (color: $text_lt_default),
     suble_star_dark: (color: $text_dk_default),
     empty_star_dark: (color: $border_dark),
@@ -111,4 +111,13 @@
       }
     }
   }
+  .yellow-star-selected {
+    color: $yellow; 
+  }
+  .primary-star-selected {
+    color: $royal 
+  }
+  .suble-star-selected {
+    color: $text_lt_default;
+  }
 }

data/app/pb_kits/playbook/pb_star_rating/docs/_star_rating_interactive.html.erb

@@ -0,0 +1 @@
+<%= pb_rails("star_rating", props: { padding_bottom: "xs", variant: "interactive" }) %>

data/app/pb_kits/playbook/pb_star_rating/docs/example.yml

@@ -13,4 +13,4 @@ examples:
     - star_rating_background_options: Background Options
     - star_rating_hide: Layout Options
     - star_rating_number_config: Number Config
-    - star_rating_size_options: Size Options
+    - star_rating_size_options: Size Options

data/app/pb_kits/playbook/pb_star_rating/index.js

@@ -0,0 +1,50 @@
+import PbEnhancedElement from "../pb_enhanced_element";
+
+const STAR_RATING_SELECTOR = "[data-pb-star-rating]";
+const STAR_RATING_INPUT_ID = "star-rating-input";
+
+export default class PbStarRating extends PbEnhancedElement {
+  static get selector() {
+    return STAR_RATING_SELECTOR;
+  }
+
+  connect() {
+    this.element.addEventListener("click", (event) => {
+      const clickedStarId = event.currentTarget.id;
+      this.updateStarColors(clickedStarId);
+      this.updateHiddenInputValue(clickedStarId);
+    });
+  }
+
+  updateStarColors(clickedStarId) {
+    const allStars = document.querySelectorAll(STAR_RATING_SELECTOR);
+
+    allStars.forEach(star => {
+      const starId = star.id;
+      const icon = star.querySelector(".interactive-star-icon");
+
+      if (icon) {
+        if (starId <= clickedStarId) {
+          if (star.classList.contains("yellow_star")) {
+            icon.classList.add("yellow-star-selected");
+          } else if (star.classList.contains("primary_star")) {
+            icon.classList.add("primary-star-selected");
+          } else if (star.classList.contains("suble_star_light")) {
+            icon.classList.add("suble-star-selected");
+          } else {
+            icon.classList.add("yellow-star-selected");
+          }
+        } else {
+          icon.classList.remove("yellow-star-selected", "primary-star-selected", "suble-star-selected");
+        }
+      }
+    });
+  }
+
+  updateHiddenInputValue(value) {
+    const hiddenInput = document.getElementById(STAR_RATING_INPUT_ID);
+    if (hiddenInput) {
+      hiddenInput.value = value;
+    }
+  }
+}

data/app/pb_kits/playbook/pb_star_rating/star_rating.html.erb

@@ -28,13 +28,33 @@
     <% end %>
   <% end %>
   <%= pb_rails("flex", props: { }) do %>
-    <% object.star_count.times do %>
-        <%= pb_rails("icon", props: { classname: "#{star_color} pb_star_#{size}" , custom_icon: Playbook::Engine.root.join(star_svg_path) } ) %>
-    <% end %>
-    <% object.empty_stars.times do %>
-        <%= pb_rails("icon", props: { classname: "#{background_star_color} pb_star_#{size}", custom_icon: Playbook::Engine.root.join(background_star_path) } ) %>
+
+    <% if object.variant == "display" %>
+
+      <% object.star_count.times do %>
+          <%= pb_rails("icon", props: { classname: "#{star_color} pb_star_#{size}" , custom_icon: Playbook::Engine.root.join(star_svg_path) } ) %>
+      <% end %>
+      <% object.empty_stars.times do %>
+          <%= pb_rails("icon", props: { classname: "#{background_star_color} pb_star_#{size}", custom_icon: Playbook::Engine.root.join(background_star_path) } ) %>
+      <% end %>
+  
+    <% else %>
+      <%= pb_rails("flex", props: { orientation: "column" }) do %>
+        <% if object.label.present? %>
+          <%= pb_rails("caption", props: {text: object.label, margin_bottom:"xs"}) %>
+        <% end %>
+        <input type="hidden" id="star-rating-input" value="" name="<%= object.name %>"/>
+        <%= pb_rails("flex", props: { orientation: "row" }) do %>
+          <% object.denominator.times do |index| %>
+            <div data-pb-star-rating id="<%= index + 1 %>" class="<%= star_color %>">
+              <%= pb_rails("icon", props: { classname: "#{background_star_color} pb_star_#{size} interactive-star-icon", custom_icon: Playbook::Engine.root.join(background_star_path)} ) %>
+            </div>
+          <% end %>
+        <% end %>
+      <% end %>
     <% end %>
   <% end %>
+
   <% if layout_option == "onestar" %>
     <%= content_tag(:div, class: "pb_star_rating_number_#{size}") do %>
       <% case object.size %>

data/app/pb_kits/playbook/pb_star_rating/star_rating.rb

@@ -25,6 +25,12 @@ module Playbook
                              values: %w[fill outline],
                              default: "fill"
 
+      prop :variant, type: Playbook::Props::Enum,
+                     values: %w[display interactive],
+                     default: "display"
+      prop :label, type: Playbook::Props::String
+      prop :name, type: Playbook::Props::String
+
       def one_decimal_rating
         rating.to_f.round(1)
       end

data/app/pb_kits/playbook/pb_table/_table.tsx

@@ -33,7 +33,7 @@ type TableProps = {
     verticalBorder?: boolean,
 } & GlobalProps
 
-const Table = (props: TableProps) => {
+const Table = (props: TableProps): React.ReactElement => {
     const {
         aria = {},
         children,

data/app/pb_kits/playbook/pb_table/index.ts

@@ -1,19 +1,19 @@
 import PbEnhancedElement from '../pb_enhanced_element'
 
 export default class PbTable extends PbEnhancedElement {
-  static get selector() {
+  static get selector(): string {
     return '.table-responsive-collapse'
   }
 
-  connect() {
+  connect(): void {
     const tables = document.querySelectorAll('.table-responsive-collapse');
 
     // Each Table
     [].forEach.call(tables, (table: HTMLTableElement) => {
       // Header Titles
-      let headers: string[] = [];
+      const headers: string[] = [];
       [].forEach.call(table.querySelectorAll('th'), (header: HTMLTableCellElement) => {
-        let colSpan = header.colSpan
+        const colSpan = header.colSpan
         for (let i = 0; i < colSpan; i++) {
           headers.push(header.textContent.replace(/\r?\n|\r/, ''));
         }