@hmcts/media-viewer 4.2.4-exui-3994-f → 4.2.4-exui-3994-g

package/projects/media-viewer/src/lib/viewers/pdf-viewer/side-bar/bookmarks/bookmarks.component.ts

@@ -1,446 +0,0 @@
-import { Bookmark } from './../../../../store/models/bookmarks.interface';
-import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core';
-import { select, Store } from '@ngrx/store';
-import { Subscription, from } from 'rxjs';
-
-import { CreateBookmark, DeleteBookmark, MoveBookmark, UpdateBookmark, UpdateBookmarkScrollTop } from '../../../../store/actions/bookmark.actions';
-import * as bookmarksSelectors from '../../../../store/selectors/bookmark.selectors';
-import { AnnotationSetState } from '../../../../store/reducers/annotations.reducer';
-import { DocumentPages } from '../../../../store/reducers/document.reducer';
-import * as fromDocument from '../../../../store/selectors/document.selectors';
-import * as fromBookmarks from '../../../../store/reducers/bookmarks.reducer';
-import { getBookmarkChildren } from '../../../../store/bookmarks-store-utils';
-import { take } from 'rxjs/operators';
-import { v4 as uuid } from 'uuid';
-import { ArrayDataSource, SelectionModel } from '@angular/cdk/collections';
-import { FlatTreeControl, NestedTreeControl } from '@angular/cdk/tree';
-import { CdkDragDrop } from '@angular/cdk/drag-drop';
-
-@Component({
-    selector: 'mv-bookmarks',
-    templateUrl: './bookmarks.component.html',
-    standalone: false
-})
-
-export class BookmarksComponent implements OnInit, OnDestroy, OnChanges {
-
-  @Input()
-  set bookmarkNodes(value: Bookmark[]) {
-    this.rebuildTreeForData(value);
-    if (this._bookmarkNodes && this.sortMode !== this.customSort) {
-      this.sortBookmarks();
-    }
-  };
-
-  get bookmarkNodes() {
-    return this._bookmarkNodes;
-  };
-
-  @Input() zoom: number;
-  @Input() rotate: number;
-  @Input() parentScrollTop: number;
-  @Output() goToDestination = new EventEmitter<any[]>();
-  @Output() treeHasChanged = new EventEmitter<boolean>()
-
-  private _bookmarkNodes: Bookmark[] = [];
-  datasource: ArrayDataSource<Bookmark>;
-  treeControl: FlatTreeControl<Bookmark>;
-  hoveredNode: Bookmark;
-  hoverHtmlElement: HTMLElement;
-  // expansion model tracks expansion state
-  expansionModel = new SelectionModel<Bookmark>(true);
-  isDraggingOn = false;
-  isUserdragging = false;
-  expandTimeout: any;
-  expandDelay = 1000;
-  dragNodeInsertToParent: boolean;
-
-  pageLookup: { [pageId: number]: DocumentPages } = {};
-  editableBookmark: string;
-  BOOKMARK_CHAR_LIMIT = 30;
-
-  dragNode: any;
-  dragNodeExpandOverWaitTimeMs = 300;
-  dragNodeExpandOverNode: any;
-  dragNodeExpandOverTime: number;
-  dragNodeExpandOverArea: number;
-
-
-  options = {
-    allowDrag: true,
-    allowDrop: true
-  };
-
-  $subscription: Subscription;
-
-  private sortMode: string;
-
-  private readonly _customSort = 'CUSTOM';
-  private readonly _positionSort = 'POSITION';
-
-  constructor(private store: Store<fromBookmarks.BookmarksState | AnnotationSetState>) { }
-
-  ngOnInit(): void {
-    this.sortMode = this.customSort;
-    this.$subscription = this.store.pipe(select(bookmarksSelectors.getEditableBookmark))
-      .subscribe(editableId => this.editableBookmark = editableId);
-    this.$subscription.add(this.store.select(fromDocument.getPages)
-      .subscribe(pages => {
-
-        Object.keys(pages).map(key => {
-          this.pageLookup[key] = pages[key];
-        });
-
-      }));
-  }
-
-  ngOnChanges(changes: SimpleChanges): void {
-    if (changes?.bookmarkNodes) {
-      setTimeout(() => {
-        this.store.dispatch(new UpdateBookmarkScrollTop(this.parentScrollTop));
-      }, 200);
-    }
-  }
-
-  ngOnDestroy(): void {
-    this.$subscription.unsubscribe();
-  }
-
-  editBookmark(id) {
-    this.editableBookmark = id;
-  }
-
-  onAddBookmarkClick() {
-    this.store.pipe(select(bookmarksSelectors.getBookmarkInfo), take(1))
-      .subscribe((bookmarkInfo) => {
-        this.store.dispatch(new CreateBookmark({
-          ...bookmarkInfo, name: '', id: uuid()
-        } as any));
-      });
-  }
-
-  deleteBookmark2(node: Bookmark) {
-    this.customSortBookmarks();
-    let next: Bookmark;
-
-    const changedData = JSON.parse(JSON.stringify(this.bookmarkNodes));
-    const siblings = this.findNodeSiblings(changedData, node.id);
-    if (siblings && siblings.length > node.index + 1) {
-      next = siblings[node.index + 1];
-      next.previous = node.previous;
-    }
-    const toDelete = [node.id, ...getBookmarkChildren(node.children)];
-    this.store.dispatch(new DeleteBookmark({
-      deleted: toDelete, updated: next
-    }));
-  }
-
-  updateBookmark(bookmark: Bookmark, name) {
-    const editedBookmark = {
-      ...bookmark,
-      name
-    };
-    if (name) {
-      this.store.dispatch(new UpdateBookmark(editedBookmark));
-      this.editableBookmark = undefined;
-    }
-  }
-
-  goToBookmark(bookmark: Bookmark) {
-    const thisPage = this.pageLookup[bookmark.pageNumber + 1];
-    const defaultHeight = thisPage.styles.height;
-    const defaultScaleY = this.scaledY(bookmark.yCoordinate, defaultHeight, thisPage);
-
-    let top = 0, left = 0;
-    switch (this.rotate) {
-      case 90:
-        left = - defaultScaleY;
-        break;
-      case 180:
-        top = this.scaledY(bookmark.yCoordinate, (defaultHeight - (24 * this.zoom)), thisPage);
-        break;
-      case 270:
-        left = defaultScaleY;
-        break;
-      default:
-        top = defaultScaleY;
-    }
-
-    this.goToDestination.emit([
-      bookmark.pageNumber,
-      { 'name': 'XYZ' },
-      left,
-      top
-    ]);
-  }
-
-  get customSort() {
-    return this._customSort;
-  }
-
-  get positionSort() {
-    return this._positionSort;
-  }
-
-  sort(mode: string) {
-    this.sortMode = mode;
-    this.sortBookmarks();
-  }
-
-  private sortBookmarks() {
-    switch (this.sortMode) {
-      case this.customSort: {
-        this.customSortBookmarks();
-        break;
-      }
-      case this.positionSort: {
-        this.positionSortBookmarks();
-        break;
-      }
-      default: {
-        this.customSortBookmarks();
-        break;
-      }
-    }
-  }
-
-  private positionSortBookmarks() {
-    this.bookmarkNodes.sort((a, b) => a.pageNumber === b.pageNumber ? a.yCoordinate - b.yCoordinate : a.pageNumber - b.pageNumber);
-    this.isDraggingOn = false;
-    this.rebuildTreeForData(this.bookmarkNodes);
-  }
-
-  private customSortBookmarks() {
-    if (this.bookmarkNodes.length > 1) {
-      this.bookmarkNodes.sort((a, b) => a.index - b.index);
-    }
-    this.isDraggingOn = true;
-    this.rebuildTreeForData(this.bookmarkNodes);
-  }
-
-  private scaledY(yCoordinate: number, height: number, page: DocumentPages): number {
-    const viewportScale = page.viewportScale / this.zoom;
-    return ((height / this.zoom) - yCoordinate) / viewportScale;
-  }
-
-  hasChild = (_: number, node: Bookmark) => {
-    return node.children && node.children.length > 0;
-  }
-
-  getNode(bookmarks, parentId) {
-    if (typeof bookmarks !== 'undefined') {
-      for (let i = 0; i < bookmarks.length; i++) {
-        if (bookmarks[i].id === parentId) {
-          return [bookmarks[i]];
-        }
-        const a = this.getNode(bookmarks[i].children, parentId);
-        if (a !== null) {
-          return a;
-        }
-      }
-    }
-    return null;
-  }
-
-  drop(event: CdkDragDrop<Bookmark>) {
-
-    if (!event.isPointerOverContainer || (event.previousIndex === event.currentIndex)) return;
-
-    const hasMovedUpTheTree = event.previousIndex > event.currentIndex;
-    const bookmarkNodesString = JSON.stringify(this._bookmarkNodes);
-    const changedData = JSON.parse(bookmarkNodesString);
-    const visibleNodes = this.visibleNodes(this._bookmarkNodes);
-    const toNode = visibleNodes[event.currentIndex] as Bookmark;
-    const toNodeSiblings = this.findNodeSiblings(changedData, toNode.id);
-
-    const toNodeParent = toNodeSiblings[0].parent;
-    const toIndex = toNodeSiblings.findIndex(s => s.id === toNode.id);
-
-    const fromNode = event.item.data as Bookmark;
-    const fromNodeSiblings = this.findNodeSiblings(changedData, fromNode.id);
-    const fromIndex = fromNodeSiblings.findIndex(n => n.id === fromNode.id);
-
-    if (this.isToNodeChildOfFromNode(fromNode?.children, toNode)) return;
-
-    if (this.dragNodeInsertToParent) {
-
-      const indexOfParent = toNodeSiblings.findIndex(element => element.id === toNode.id);
-      const parentNode = toNodeSiblings[indexOfParent];
-      const firstChild = parentNode?.children && parentNode?.children.length > 0 ? parentNode.children[0] : null;
-      let movedBookmarksWithParent = [{ ...fromNode, parent: parentNode.id, previous: null }];
-
-      if (firstChild) {
-        movedBookmarksWithParent = [...movedBookmarksWithParent, { ...firstChild, previous: fromNode.id }];
-      }
-
-      let fromNodeSibling = this.getSiblingFromAllSibliings(fromNodeSiblings, fromIndex + 1);
-      const nextFromindexforParent = fromIndex + 1;
-      fromNodeSibling = fromNodeSibling && fromNodeSibling.id === fromNode.previous ? this.getSiblingFromAllSibliings(fromNodeSiblings, nextFromindexforParent + 1) : fromNodeSibling;
-
-      if (fromNodeSibling && fromNodeSibling.id !== parentNode.id) {
-        movedBookmarksWithParent = [...movedBookmarksWithParent, { ...fromNodeSibling, previous: fromNode.previous }];
-      }
-
-      let previousSiblingForParentIndex = toIndex - 1;
-      let parentNodeSibling = this.getSiblingFromAllSibliings(toNodeSiblings, previousSiblingForParentIndex);
-
-      if (parentNodeSibling && parentNodeSibling.id == fromNode.id) {
-        previousSiblingForParentIndex = previousSiblingForParentIndex - 1;
-        if (previousSiblingForParentIndex >= 0) {
-          parentNodeSibling = this.getSiblingFromAllSibliings(toNodeSiblings, previousSiblingForParentIndex);
-        }
-        else {
-          parentNodeSibling = null;
-        }
-      }
-
-      movedBookmarksWithParent = [...movedBookmarksWithParent, { ...parentNode, previous: parentNodeSibling?.id }];
-
-      const hasParentDups = (movedBookmarksWithParent as Bookmark[]).map(x => x.id).some(function (value, index, array) {                            // .some will break as soon as duplicate found (no need to itterate over all array)
-        return array.indexOf(value) !== array.lastIndexOf(value);   // comparing first and last indexes of the same value
-      })
-      if (hasParentDups || movedBookmarksWithParent && movedBookmarksWithParent.length <= 1) return;
-
-      this.store.dispatch(new MoveBookmark(movedBookmarksWithParent));
-      return;
-    }
-
-    if (!toNodeSiblings) return;
-
-    const fromNodePrevious = hasMovedUpTheTree ? toNode.previous : toNode.id;
-    let movedBookmarks = [{
-      ...fromNode,
-      previous: toNode.index > 0 ? fromNodePrevious : undefined,
-      parent: toNodeParent
-    }];
-
-    let fromNodeSibling = this.getSiblingFromAllSibliings(fromNodeSiblings, fromIndex + 1);
-    const nextFromindex = fromIndex + 1;
-    fromNodeSibling = fromNodeSibling && fromNodeSibling.id === fromNode.previous ? this.getSiblingFromAllSibliings(fromNodeSiblings, nextFromindex + 1) : fromNodeSibling;
-
-    if (fromNodeSibling) {
-      movedBookmarks = [...movedBookmarks, { ...fromNodeSibling, previous: fromNode.previous }];
-    }
-
-
-    let toNodeSiblingIndex = hasMovedUpTheTree ? toIndex : toIndex + 1;
-    let toNodeSibling = this.getSiblingFromAllSibliings(toNodeSiblings, toNodeSiblingIndex);
-
-    if (toNodeSibling) {
-      movedBookmarks = [...movedBookmarks, { ...toNodeSibling, previous: fromNode.id }];
-    }
-
-    const hasDups = (movedBookmarks as Bookmark[]).map(x => x.id).some(function (value, index, array) {
-      return array.indexOf(value) !== array.lastIndexOf(value);   // comparing first and last indexes of the same value
-    })
-    if (hasDups || movedBookmarks && movedBookmarks.length <= 1) return;
-
-    this.store.dispatch(new MoveBookmark(movedBookmarks));
-  }
-
-  private getSiblingFromAllSibliings(sibling: Bookmark[], index) {
-    return sibling.length > index ? sibling[index] : undefined;
-  }
-
-  dragStart() {
-    this.dragNodeInsertToParent = false;
-    this.hoveredNode = null;
-    this.isUserdragging = true;
-  }
-
-  dragEnd() {
-    this.isUserdragging = false;
-    if (this.hoverHtmlElement?.style) {
-      this.hoverHtmlElement.style.borderRight = '';
-    }
-  }
-
-  dragHover(event: any, node: Bookmark) {
-    if (this.isUserdragging) {
-      const newEvent: any = event;
-      const percentageX = newEvent.offsetX / newEvent.target.clientWidth;
-      if (percentageX > .55) {
-        this.hoveredNode = node;
-        if (this.hoverHtmlElement?.style) {
-          this.hoverHtmlElement.style.borderRight = '';
-        }
-        this.hoverHtmlElement = event.currentTarget;
-        this.hoverHtmlElement.style.borderRight = '5px solid #007bff';
-        this.dragNodeInsertToParent = true;
-      } else {
-        this.hoveredNode = null;
-        if (this.hoverHtmlElement?.style) {
-          this.hoverHtmlElement.style.borderRight = '';
-        }
-        this.dragNodeInsertToParent = false;
-      }
-    }
-  }
-
-  dragHoverEnd(event: any, node: Bookmark) {
-    if (this.isUserdragging) {
-      if (!node || this.hoveredNode?.id !== node.id) {
-        this.dragNodeInsertToParent = false;
-        if (this.hoverHtmlElement?.style) {
-          this.hoverHtmlElement.style.borderRight = '';
-        }
-        this.hoveredNode = null;
-      }
-    }
-  }
-
-  onNodeExpand(node: Bookmark) {
-    const isExpanded = this.treeControl.isExpanded(node);
-    return isExpanded ? "toggle-children-wrapper-expanded" : "toggle-children-wrapper-collapsed";
-  }
-
-  visibleNodes(bookmarks: Bookmark[]): Bookmark[] {
-    const result = [];
-
-    function addExpandedChildren(node: Bookmark, expanded: Bookmark[]) {
-      result.push(node);
-      if (expanded.some(bookmark => bookmark && bookmark.id === node.id) && node.children) {
-        node.children.map((child) => addExpandedChildren(child, expanded));
-      }
-    }
-    bookmarks.forEach((node) => {
-      addExpandedChildren(node, this.treeControl.expansionModel.selected);
-    });
-    return result;
-  }
-
-  findNodeSiblings(arr: Array<any>, id: string): Array<any> {
-    let result, subResult;
-    arr.forEach((item, i) => {
-      if (item.id === id) {
-        result = arr;
-      } else if (item?.children) {
-        subResult = this.findNodeSiblings(item.children, id);
-        if (subResult) result = subResult;
-      }
-    });
-    return result;
-  }
-
-  rebuildTreeForData(data: any) {
-    this._bookmarkNodes = data ?? [];
-    this.datasource = new ArrayDataSource(this._bookmarkNodes);
-    this.treeControl = new NestedTreeControl<Bookmark>(node => node.children);
-    this.treeControl.dataNodes = this._bookmarkNodes;
-    this.expansionModel.selected.forEach((bookmark) => {
-      const node = this.treeControl.dataNodes.find((n) => n.id === bookmark.id);
-      this.treeControl.expand(node);
-    });
-    this.treeHasChanged.emit(true);
-  }
-
-  isToNodeChildOfFromNode(fromNodeChildren: Bookmark[], toNode: Bookmark) {
-
-    if (!fromNodeChildren) {
-      return false;
-    }
-
-    const result = this.getNode(fromNodeChildren, toNode.id);
-    return result ? true : false;
-  }
-}

package/projects/media-viewer/src/lib/viewers/pdf-viewer/side-bar/bookmarks/bookmarks.interfaces.ts

@@ -1,16 +0,0 @@
-export interface Bookmark {
-  id: string;
-  documentId: string;
-  name: string;
-  pageNumber: number;
-  xCoordinate: number;
-  yCoordinate: number;
-  children: any[];
-  previous: string;
-  index: number;
-}
-
-export interface BookmarksPerPage {
-  bookmark: { [id: string]: Bookmark };
-  styles: { left: number, height: number, width: number };
-}

package/projects/media-viewer/src/lib/viewers/pdf-viewer/side-bar/outline-item/outline-item.component.html

@@ -1,32 +0,0 @@
-<div class="outlineItem">
-  <div *ngIf="outline.items.length > 0"
-       [ngClass]="{ 'outlineItemToggler': true, 'outlineItemsHidden': !showOutlineItems }"
-       (click)="toggleOutline()"
-       (keyup.enter)="toggleOutline()" tabindex="0"></div>
-  <a (click)="goToDestination(outline?.dest)"
-     (keyup.enter)="goToDestination(outline?.dest)"
-     [style.font-weight]="outline.bold ? 'bold' : ''"
-     [style.font-style]="outline.italic ? 'italic' : ''"
-     [ngClass]="showHighlightOutlineCss()"
-     tabindex="0">
-    <div style="text-align:left;" [ngClass]="showHighlightOutlineCss()">
-      {{ outline.title }}
-      <span style="float:right;">
-        {{ outline.pageNumber }}
-      </span>
-    </div>
-  </a>
-  
-  <div *ngIf="outline.items.length > 0" class="outlineItems">
-    <div *ngFor="let outlineItem of outline.items; index as i">
-      <mv-outline-item
-        [outline]="outlineItem" 
-        [currentPageNumber]= "currentPageNumber" 
-        [isCurrentSection]= "isViewedItem(outlineItem, outline.items[i+1])"
-        [endPage]="findEndPage(outline.items[i+1])"
-        (navigationEvent)="goToDestination($event)">
-      </mv-outline-item>
-    </div>
-  </div>
-</div>
-

package/projects/media-viewer/src/lib/viewers/pdf-viewer/side-bar/outline-item/outline-item.component.spec.ts

@@ -1,94 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { OutlineItemComponent } from './outline-item.component';
-import { Outline } from './outline.model';
-
-describe('OutlineItemComponent', () => {
-  let component: OutlineItemComponent;
-  let fixture: ComponentFixture<OutlineItemComponent>;
-
-  const outline: Outline = {
-    bold: true,
-    color: new Uint8ClampedArray(2),
-    count: 1,
-    dest: [],
-    italic: true,
-    items: [],
-    newWindow: false,
-    pageNumber: 0,
-    title: 'Outline',
-    unsafeUrl: '',
-    url: '',
-  };
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      declarations: [OutlineItemComponent]
-    })
-      .compileComponents();
-    fixture = TestBed.createComponent(OutlineItemComponent);
-    component = fixture.componentInstance;
-    component.outline = outline;
-    component.outline.dest = [];
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  it('should toggle outline true/false', () => {
-    component.showOutlineItems = false;
-    component.toggleOutline();
-
-    expect(component.showOutlineItems).toEqual(true);
-
-    component.toggleOutline();
-
-    expect(component.showOutlineItems).toEqual(false);
-  });
-
-  it('should emit navigation event', () => {
-    const navigateSpy = spyOn(component.navigationEvent, 'emit');
-
-    component.goToDestination(outline.dest);
-
-    expect(navigateSpy).toHaveBeenCalled();
-  });
-
-  it('should not emit navigation event', () => {
-    const navigateSpy = spyOn(component.navigationEvent, 'emit');
-    component.outline.dest = undefined;
-
-    component.goToDestination(outline.dest);
-
-    expect(navigateSpy).not.toHaveBeenCalled();
-  });
-
-  it('should identify if currently viewed item', () => {
-    outline.pageNumber = 1;
-    component.currentPageNumber = 1;
-    component.endPage = 3;
-    expect(component.isViewedItem(outline, undefined)).toBe(true);
-    component.currentPageNumber = 2;
-    expect(component.isViewedItem(outline, undefined)).toBe(true);
-    component.currentPageNumber = 0;
-    expect(component.isViewedItem(outline, undefined)).toBe(false);
-    component.currentPageNumber = 3;
-    expect(component.isViewedItem(outline, undefined)).toBe(false);
-
-    const nextOutline = <Outline>{};
-    nextOutline.pageNumber = 2;
-    component.currentPageNumber = 1;
-    expect(component.isViewedItem(outline, nextOutline)).toBe(true);
-    component.currentPageNumber = 2;
-    expect(component.isViewedItem(outline, nextOutline)).toBe(false);
-  });
-
-  it('should find the ending page number', () => {
-    component.endPage = Math.floor(Math.random() * 1000);
-    expect(component.findEndPage(undefined)).toBe(component.endPage);
-    const nextOutline = <Outline>{};
-    nextOutline.pageNumber = Math.floor(Math.random() * 10000);
-    expect(component.findEndPage(nextOutline)).toBe(nextOutline.pageNumber);
-  });
-});

package/projects/media-viewer/src/lib/viewers/pdf-viewer/side-bar/outline-item/outline-item.component.ts

@@ -1,48 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { Outline } from './outline.model';
-
-@Component({
-    selector: 'mv-outline-item',
-    templateUrl: './outline-item.component.html',
-    standalone: false
-})
-export class OutlineItemComponent implements OnInit {
-
-  @Input() outline: Outline;
-  @Input() currentPageNumber: number;
-  @Input() isCurrentSection: boolean;
-  @Input() endPage: number;
-  @Output() navigationEvent = new EventEmitter();
-
-  showOutlineItems: boolean;
-
-  ngOnInit() {
-    this.showOutlineItems = true;
-  }
-
-  goToDestination(destination: any) {
-    if (destination) {
-      this.navigationEvent.emit(destination);
-    }
-  }
-
-  toggleOutline() {
-    this.showOutlineItems = !this.showOutlineItems;
-  }
-
-  isViewedItem(current: Outline, next: Outline): boolean {
-    if (current.pageNumber === this.currentPageNumber) {
-      return true;
-    }
-    return next === undefined ? current.pageNumber <= this.currentPageNumber && this.endPage > this.currentPageNumber :
-      current.pageNumber <= this.currentPageNumber && (next.pageNumber > this.currentPageNumber);
-  }
-
-  findEndPage(next: Outline): number {
-    return next === undefined ? this.endPage : next.pageNumber;
-  }
-
-  showHighlightOutlineCss() {
-    return this.isCurrentSection ? 'highlightedOutlineItem' : 'outlineItem';
-  }
-}

package/projects/media-viewer/src/lib/viewers/pdf-viewer/side-bar/outline-item/outline.model.ts

@@ -1,13 +0,0 @@
-export interface Outline {
-  bold: boolean;
-  color: Uint8ClampedArray;
-  count: number | undefined;
-  dest: string | Array<any> | null;
-  italic: boolean;
-  items: Outline[];
-  newWindow: boolean | undefined;
-  pageNumber?: number;
-  title: string;
-  unsafeUrl: string | undefined;
-  url: string | null;
-}