chore: cleanup

This commit is contained in:
Igor Randjelovic
2021-02-26 22:31:21 +01:00
committed by Nathan Walker
parent 3402710b56
commit ff450755be
5 changed files with 138 additions and 49 deletions

View File

@@ -120,44 +120,86 @@ export namespace iOSNativeHelper {
return transform;
}
export function getShadowLayer(nativeView: UIView, name?: string): CALayer {
let layer: CALayer;
name = name || 'ns-shadow-layer';
if (nativeView) {
if (nativeView.layer) {
if (nativeView.layer.name === name) {
console.log('- found shadow layer - reusing.');
return nativeView.layer;
} else {
if (nativeView.layer.sublayers && nativeView.layer.sublayers.count) {
console.log('nativeView.layer.sublayers.count:', nativeView.layer.sublayers.count);
for (let i = 0; i < nativeView.layer.sublayers.count; i++) {
console.log(`layer ${i}:`, nativeView.layer.sublayers.objectAtIndex(i));
console.log(`layer ${i} name:`, nativeView.layer.sublayers.objectAtIndex(i).name);
if (nativeView.layer.sublayers.objectAtIndex(i).name === name) {
return nativeView.layer.sublayers.objectAtIndex(i);
}
}
if (nativeView instanceof UITextView) {
layer = nativeView.layer.sublayers.objectAtIndex(1);
} else {
layer = nativeView.layer.sublayers.objectAtIndex(nativeView.layer.sublayers.count - 1);
}
} else {
layer = nativeView.layer;
}
export function getShadowLayer(nativeView: UIView, name: string = 'ns-shadow-layer', create: boolean = true): CALayer {
return nativeView.layer;
console.log(`--- ${create ? 'CREATE' : 'READ'}`);
/**
* UIView
* -> Shadow
*
*
* UIView
* -> UIView
* -> Shadow
*/
if (!nativeView) {
return null;
}
if (!nativeView.layer) {
// should never hit this?
console.log('- no layer! -');
return null;
}
// if the nativeView's layer is the shadow layer?
if (nativeView.layer.name === name) {
console.log('- found shadow layer - reusing.');
return nativeView.layer;
}
console.log('>> layer :', nativeView.layer);
if (nativeView.layer.sublayers?.count) {
const count = nativeView.layer.sublayers.count;
for (let i = 0; i < count; i++) {
const subLayer = nativeView.layer.sublayers.objectAtIndex(i);
console.log(`>> subLayer ${i + 1}/${count} :`, subLayer);
console.log(`>> subLayer ${i + 1}/${count} name :`, subLayer.name);
if (subLayer.name === name) {
console.log('- found shadow sublayer - reusing.');
return subLayer;
}
} else {
// could this occur?
console.log('no layer!');
}
// if (nativeView instanceof UITextView) {
// return nativeView.layer.sublayers.objectAtIndex(1);
// } else {
// return nativeView.layer.sublayers.objectAtIndex(nativeView.layer.sublayers.count - 1);
// }
}
console.log('layer.name:', layer.name);
if (!layer.name) {
// only explicitly name if the developer had not named it themselves and/or some other integration
layer.name = name;
// else {
// layer = nativeView.layer;
// }
// we're not interested in creating a new layer
if (!create) {
return null;
}
return layer;
console.log(`- adding a new layer for - ${name}`);
const viewLayer = nativeView.layer;
const newLayer = CALayer.layer();
newLayer.name = name;
newLayer.zPosition = 0.0;
// nativeView.layer.insertSublayerBelow(newLayer, nativeView.layer)
// newLayer.insertSublayerAtIndex(nativeView.layer, 0)
// nativeView.layer.zPosition = 1.0;
// nativeView.layer.addSublayer(newLayer);
// nativeView.layer = CALayer.layer()
nativeView.layer.insertSublayerAtIndex(newLayer, 0);
// nativeView.layer.insertSublayerAtIndex(viewLayer, 1)
// nativeView.layer.replaceSublayerWith(newLayer, nativeView.layer);
return newLayer;
}
export function createUIDocumentInteractionControllerDelegate(): NSObject {