Skip to content

Commit

Permalink
Revert "chore: use optional chaining"
Browse files Browse the repository at this point in the history
This reverts commit 282141f.
  • Loading branch information
Carlos Rodrigues committed Nov 6, 2019
1 parent 282141f commit e96ca76
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 20 deletions.
8 changes: 4 additions & 4 deletions src/event/event.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ import { RefTyped , wrap} from "../utils";
export type RemoveEventFunction = () => void;

export function useEvent<K extends keyof DocumentEventMap>(
el: RefTyped<Element | null>,
el: RefTyped<Element>,
name: K,
listener: (this: Document, ev: DocumentEventMap[K]) => any,
options?: boolean | AddEventListenerOptions
): RemoveEventFunction;
export function useEvent(
el: RefTyped<Element | null>,
el: RefTyped<Element>,
name: string,
listener: EventListenerOrEventListenerObject,
options?: boolean | AddEventListenerOptions
): RemoveEventFunction {
const element = wrap(el);

const remove = () => element.value?.removeEventListener(name, listener);
const remove = () => element.value.removeEventListener(name, listener);

onMounted(() => element.value?.addEventListener(name, listener, options));
onMounted(() => element.value.addEventListener(name, listener, options));
onUnmounted(remove);

return remove;
Expand Down
9 changes: 5 additions & 4 deletions src/event/onResize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@ export function useOnResize(
): ResizeResult {
const element = wrap(el);

const height = ref(element.value?.clientHeight || 0);
const width = ref(element.value?.clientWidth || 0);
const height = ref(element.value && element.value.clientHeight);
const width = ref(element.value && element.value.clientWidth);

let handler = () => {
height.value = element.value!.clientHeight;
width.value = element.value!.clientWidth;
debugger
height.value = element.value.clientHeight;
width.value = element.value.clientWidth;
};

const eventOptions = typeof options === "number" ? undefined : options;
Expand Down
8 changes: 4 additions & 4 deletions src/event/onScroll.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ export function useOnScroll(
): ScrollResult {
const element = wrap(el);

const scrollTop = ref(element.value?.scrollTop || 0);
const scrollLeft = ref(element.value?.scrollLeft || 0);
const scrollTop = ref(element.value && element.value.scrollTop);
const scrollLeft = ref(element.value && element.value.scrollLeft);

let handler = (ev: Event) => {
scrollTop.value = element.value!.scrollTop;
scrollLeft.value = element.value!.scrollLeft;
scrollTop.value = element.value.scrollTop;
scrollLeft.value = element.value.scrollLeft;
};

const eventOptions = typeof options === "number" ? undefined : options;
Expand Down
2 changes: 1 addition & 1 deletion src/pagination/arrayPagination.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function useArrayPagination<T extends Array<TR>, TR>(
pageSize: 10,
},
...options,
total: computed(() => arrayRef.value?.length || 0)
total: computed(() => arrayRef.value.length)
});

const result = computed(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Ref, isRef, ref } from "@vue/composition-api";

export type RefTyped<T> = T | Ref<T>;
export type RefElement = RefTyped<Element | null>;
export type RefElement = RefTyped<Element>;

// export function unwrap<T>(o: RefTyped<T>): T {
// return isRef(o) ? o.value : o;
Expand Down
8 changes: 3 additions & 5 deletions src/web/axios.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import { computed } from "@vue/composition-api";
import axios, { AxiosRequestConfig } from "axios";
import { ref, computed, watch } from "@vue/composition-api";
import axios, { AxiosRequestConfig, AxiosError } from "axios";
import { usePromise } from "../promise/promise";

/* istanbul ignore next */
const _axios = axios || (globalThis && (globalThis as any).axios);

export function useAxios<TData = any>(config?: AxiosRequestConfig) {
/* istanbul ignore next */
__DEV__ &&
!_axios &&
console.warn(`[axios] not installed, please install it`);
__DEV__ && !_axios && console.warn(`[axios] not installed, please install it`);

const axiosClient = _axios.create(config);
const client = computed(() => axiosClient);
Expand Down
2 changes: 1 addition & 1 deletion src/web/fetch.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { usePromise } from "../promise/promise";
import { ref, computed } from "@vue/composition-api";
import { ref, computed, watch } from "@vue/composition-api";

export interface UseFetchOptions {
/**
Expand Down

0 comments on commit e96ca76

Please sign in to comment.